PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694

Change-Id: If5f56ddec0325992bb5f1b4c66e1ff8d4b1da026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
YK Hung
2022-05-09 02:14:37 +00:00
committed by Automerger Merge Worker
parent f6093ba54c 9d0da1b613
commit 8c8b569e4e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/fuelgauge/BatteryEntry.java
View File

@@ -209,7 +209,8 @@ public class BatteryEntry {
if (packages != null && packages.length == 1) { if (packages != null && packages.length == 1) {
mDefaultPackageName = packages[0]; mDefaultPackageName = packages[0];
} else { } else {
mDefaultPackageName = uidBatteryConsumer.getPackageWithHighestDrain(); mDefaultPackageName = isSystemUid(uid)
? PACKAGE_SYSTEM : uidBatteryConsumer.getPackageWithHighestDrain();
} }
} }
if (mDefaultPackageName != null) { if (mDefaultPackageName != null) {
@@ -352,13 +353,8 @@ public class BatteryEntry {
} }
final PackageManager pm = context.getPackageManager(); final PackageManager pm = context.getPackageManager();
final String[] packages; final String[] packages = isSystemUid(uid)
if (uid == Process.SYSTEM_UID) { ? new String[] {PACKAGE_SYSTEM} : pm.getPackagesForUid(uid);
packages = new String[] {PACKAGE_SYSTEM};
} else {
packages = pm.getPackagesForUid(uid);
}
if (packages != null) { if (packages != null) {
final String[] packageLabels = new String[packages.length]; final String[] packageLabels = new String[packages.length];
System.arraycopy(packages, 0, packageLabels, 0, packages.length); System.arraycopy(packages, 0, packageLabels, 0, packages.length);
@@ -615,4 +611,8 @@ public class BatteryEntry {
} }
return new NameAndIcon(name, null /* icon */, iconId); return new NameAndIcon(name, null /* icon */, iconId);
} }
private static boolean isSystemUid(int uid) {
return uid == Process.SYSTEM_UID;
}
} }