commit 5a800cf0692758489367247d36e5ceb29004eb01
author Amith Yamasani <yamasani@google.com> Thu Aug 03 23:07:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 03 23:07:32 2017 +0000
tree bdc39be6de26cf7fc30f23284bf4e6373ca1ce86
parent e09e5ef21b703177cad81cfa6f38260b9f347a4b
parent fd3caf6a7d06c9d696b87ec631be5b109b07fcdc

Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev

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 30875a8..3bb20b4 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -3597,7 +3597,12 @@
     }
 
     public void noteUidProcessStateLocked(int uid, int state) {
-        uid = mapUid(uid);
+        int parentUid = mapUid(uid);
+        if (uid != parentUid) {
+            // Isolated UIDs process state is already rolled up into parent, so no need to track
+            // Otherwise the parent's process state will get downgraded incorrectly
+            return;
+        }
         getUidStatsLocked(uid).updateUidProcessStateLocked(state);
     }