Merge "Fix a bug in ControllerActivityCounter" into nyc-dev

am: 85eb7a9 * commit '85eb7a97ef59a83f45208737ac83d4b3ea8f7a2c': Fix a bug in ControllerActivityCounter
2016-03-16 15:11:56 +00:00
parent a7f3c574bf 85eb7a97ef
commit c49a5f37c8
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -1953,7 +1953,7 @@ public class BatteryStatsImpl extends BatteryStats {
         */
        @Override
        public LongSamplingCounter getIdleTimeCounter() {
-            return mRxTimeMillis;
+            return mIdleTimeMillis;
        }

        /**