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

am: 26f8f5c868

Change-Id: I44fe5b45c8cdc3d4ddd7edc210641f3883265c58
This commit is contained in:
Amith Yamasani
2017-08-03 23:29:23 +00:00
committed by android-build-merger

View File

@@ -3632,7 +3632,12 @@ public class BatteryStatsImpl extends BatteryStats {
}
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);
}