commit ee6046add136d4791e71fb17a07076b425b7250c
author Adam Lesinski <adamlesinski@google.com> Thu Jul 30 23:58:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 30 23:58:30 2015 +0000
tree c51201a59fe7a2ab4bd80476e86792cd9586137c
parent 7b3f6d5683d16917507333daf08692761e18595d
parent 00f7cb924e6964c5403c55ae5e7348aad1c8ec7b

am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev

* commit '00f7cb924e6964c5403c55ae5e7348aad1c8ec7b':
  BatteryStats: include mobile radio active count and unknown time in checkin

core/java/android/os/BatteryStats.java

diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index ecb7f5a..80169a9 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -2615,7 +2615,9 @@
                 getMobileRadioActiveAdjustedTime(which) / 1000, interactiveTime / 1000,
                 powerSaveModeEnabledTime / 1000, connChanges, deviceIdleModeEnabledTime / 1000,
                 getDeviceIdleModeEnabledCount(which), deviceIdlingTime / 1000,
-                getDeviceIdlingCount(which));
+                getDeviceIdlingCount(which),
+                getMobileRadioActiveCount(which),
+                getMobileRadioActiveUnknownTime(which) / 1000);
         
         // Dump screen brightness stats
         Object[] args = new Object[NUM_SCREEN_BRIGHTNESS_BINS];