summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-07-30 23:50:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-30 23:50:27 +0000
commit00f7cb924e6964c5403c55ae5e7348aad1c8ec7b (patch)
tree9c3e90783581a6c4e5a6e6adbdea665ab99bdc1e
parent3bf1ac54edc77d2249dc9a0ab8291efa70ff76b9 (diff)
parent782327bde70bfb92352a0270baeae04361b6e9c2 (diff)
downloadframeworks_base-00f7cb924e6964c5403c55ae5e7348aad1c8ec7b.zip
frameworks_base-00f7cb924e6964c5403c55ae5e7348aad1c8ec7b.tar.gz
frameworks_base-00f7cb924e6964c5403c55ae5e7348aad1c8ec7b.tar.bz2
Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
-rw-r--r--core/java/android/os/BatteryStats.java4
1 files changed, 3 insertions, 1 deletions
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 @@ public abstract class BatteryStats implements Parcelable {
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];