commit 61db88fc8b4a5729d9ce6bc1b7bfaac5c09c8f90
author Adam Lesinski <adamlesinski@google.com> Wed Jul 01 15:05:07 2015 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon Jul 06 15:36:46 2015 -0700
tree 06340d01f6dbb66c7d6dc7cd9a2030c41274f061
parent 5c8498db2111ea69566bc43a9e799d0447af789d

BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore

Bug:22225933
Change-Id: I384a3c37ad45af981cca5fc3e92643da948d48d0

core/java/com/android/internal/os/BatteryStatsImpl.java

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 8b4b9942..f421189 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -183,6 +183,7 @@
     public interface ExternalStatsSync {
         void scheduleSync(String reason);
         void scheduleWifiSync(String reason);
+        void scheduleCpuSyncDueToRemovedUid(int uid);
     }
 
     public final MyHandler mHandler;
@@ -2522,13 +2523,28 @@
         mIsolatedUids.put(isolatedUid, appUid);
     }
 
-    public void removeIsolatedUidLocked(int isolatedUid, int appUid) {
+    /**
+     * Schedules a read of the latest cpu times before removing the isolated UID.
+     * @see #removeIsolatedUidLocked(int)
+     */
+    public void scheduleRemoveIsolatedUidLocked(int isolatedUid, int appUid) {
         int curUid = mIsolatedUids.get(isolatedUid, -1);
         if (curUid == appUid) {
-            mIsolatedUids.delete(isolatedUid);
+            if (mExternalSync != null) {
+                mExternalSync.scheduleCpuSyncDueToRemovedUid(isolatedUid);
+            }
         }
     }
 
+    /**
+     * This should only be called after the cpu times have been read.
+     * @see #scheduleRemoveIsolatedUidLocked(int, int)
+     */
+    public void removeIsolatedUidLocked(int isolatedUid) {
+        mIsolatedUids.delete(isolatedUid);
+        mKernelUidCpuTimeReader.removeUid(isolatedUid);
+    }
+
     public int mapUid(int uid) {
         int isolated = mIsolatedUids.get(uid, -1);
         return isolated > 0 ? isolated : uid;