summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-07-15 00:30:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-15 00:30:20 +0000
commit267240f2ddbaa0ea2828d7466f310c6ffc7c91cd (patch)
treed4ccceaf2115cb3eaf40709696a10ff7d3684299 /core/java
parent56d82dd28a3c7dcca9c9dc37a73a1cf5fc44498e (diff)
parentbdb0273455c45bf5534f0f3c5759ddcb8aca3bf0 (diff)
Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/os/KernelUidCpuTimeReader.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/KernelUidCpuTimeReader.java b/core/java/com/android/internal/os/KernelUidCpuTimeReader.java
index 1a1e0b2dda74..0df78ed6a68d 100644
--- a/core/java/com/android/internal/os/KernelUidCpuTimeReader.java
+++ b/core/java/com/android/internal/os/KernelUidCpuTimeReader.java
@@ -151,6 +151,7 @@ public class KernelUidCpuTimeReader {
if (index >= 0) {
mLastUserTimeUs.removeAt(index);
mLastSystemTimeUs.removeAt(index);
+ mLastPowerMaUs.removeAt(index);
}
try (FileWriter writer = new FileWriter(sRemoveUidProcFile)) {