Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix power usage detail page is launched in wrong user"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-29 22:42:47 +00:00
committed by Android (Google) Code Review
parent 781d2c4a5a 49aea6af1f
commit 7c2aebc2b7
4 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -16,7 +16,9 @@
package com.android.settings.fuelgauge;
import android.annotation.UserIdInt;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.LoaderManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
@@ -152,7 +154,14 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,
R.string.battery_details_title, null,
new UserHandle(UserHandle.getUserId(sipper.getUid())));
new UserHandle(getUserIdToLaunchAdvancePowerUsageDetail(sipper)));
}
private static @UserIdInt int getUserIdToLaunchAdvancePowerUsageDetail(BatterySipper bs) {
if (bs.drainType == BatterySipper.DrainType.USER) {
return ActivityManager.getCurrentUser();
}
return UserHandle.getUserId(bs.getUid());
}
public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,

3
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -428,7 +428,8 @@ public class PowerUsageSummary extends PowerUsageBase implements
}
private static boolean isSystemUid(int uid) {
return uid >= Process.SYSTEM_UID && uid < Process.FIRST_APPLICATION_UID;
final int appUid = UserHandle.getAppId(uid);
return appUid >= Process.SYSTEM_UID && appUid < Process.FIRST_APPLICATION_UID;
}
/**