Merge "sys user split: first pass updating Settings"

2015-07-28 17:39:59 +00:00
parent 078d21c7da 44879a387a
commit e43640b376
16 changed files with 62 additions and 72 deletions
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -201,7 +201,7 @@ public class PowerUsageSummary extends PowerUsageBase {
                        sipper.getUid() <= Process.LAST_SHARED_APPLICATION_GID) {
                    // This is a shared gid being used to do work on behalf of an app across all
                    // users. But we'll blame the power on the device OWNER.
-                    realUid = UserHandle.getUid(UserHandle.USER_OWNER,
+                    realUid = UserHandle.getUid(UserHandle.USER_SYSTEM,
                            UserHandle.getAppIdFromSharedAppGid(sipper.getUid()));
                }