commit 3c57303a3ead09b3626d3701d3ac49ba653c5bd2
author Colin Cross <ccross@android.com> Mon Oct 03 18:10:11 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 03 18:10:12 2016 +0000
tree 0e78e5d0079f36d46f376b7f276ad502c0296726
parent f29e705b0a8c1ed79c8fbe38e9421fcd0c96d1fb
parent 0ed088bd90c4e9ae5a92047319c3932b2aa78ddf

Merge "Fix constructor parameters shadowing member variables"

include/gui/OccupancyTracker.h

diff --git a/include/gui/OccupancyTracker.h b/include/gui/OccupancyTracker.h
index 1d15e7f..d4de8f2 100644
--- a/include/gui/OccupancyTracker.h
+++ b/include/gui/OccupancyTracker.h
@@ -45,12 +45,12 @@
             occupancyAverage(0.0f),
             usedThirdBuffer(false) {}
 
-        Segment(nsecs_t totalTime, size_t numFrames, float occupancyAverage,
-                bool usedThirdBuffer)
-          : totalTime(totalTime),
-            numFrames(numFrames),
-            occupancyAverage(occupancyAverage),
-            usedThirdBuffer(usedThirdBuffer) {}
+        Segment(nsecs_t _totalTime, size_t _numFrames, float _occupancyAverage,
+                bool _usedThirdBuffer)
+          : totalTime(_totalTime),
+            numFrames(_numFrames),
+            occupancyAverage(_occupancyAverage),
+            usedThirdBuffer(_usedThirdBuffer) {}
 
         // Parcelable interface
         virtual status_t writeToParcel(Parcel* parcel) const override;