summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2015-07-30 23:58:30 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-30 23:58:30 +0000
commitee6046add136d4791e71fb17a07076b425b7250c (patch)
treec51201a59fe7a2ab4bd80476e86792cd9586137c
parent7b3f6d5683d16917507333daf08692761e18595d (diff)
parent00f7cb924e6964c5403c55ae5e7348aad1c8ec7b (diff)
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
-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 ecb7f5a200f2..80169a956f41 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];