diff options
Diffstat (limited to 'src/com/android/settings/fuelgauge')
| -rw-r--r-- | src/com/android/settings/fuelgauge/BatteryEntry.java | 34 | ||||
| -rw-r--r-- | src/com/android/settings/fuelgauge/PowerUsageSummary.java | 6 |
2 files changed, 32 insertions, 8 deletions
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java index 92eaade..4ff4dfd 100644 --- a/src/com/android/settings/fuelgauge/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/BatteryEntry.java @@ -16,15 +16,20 @@ package com.android.settings.fuelgauge; +import android.app.AppGlobals; import android.content.Context; import android.content.pm.ApplicationInfo; +import android.content.pm.IPackageManager; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.BatteryStats; import android.os.Handler; +import android.os.RemoteException; +import android.os.UserHandle; import android.os.UserManager; +import android.util.Log; import com.android.internal.os.BatterySipper; import com.android.settings.R; @@ -256,9 +261,17 @@ public class BatteryEntry { System.arraycopy(sipper.mPackages, 0, packageLabels, 0, sipper.mPackages.length); // Convert package names to user-facing labels where possible + IPackageManager ipm = AppGlobals.getPackageManager(); + final int userId = UserHandle.getUserId(uid); for (int i = 0; i < packageLabels.length; i++) { try { - ApplicationInfo ai = pm.getApplicationInfo(packageLabels[i], 0); + final ApplicationInfo ai = ipm.getApplicationInfo(packageLabels[i], + 0 /* no flags */, userId); + if (ai == null) { + Log.d(PowerUsageSummary.TAG, "Retrieving null app info for package " + + packageLabels[i] + ", user " + userId); + continue; + } CharSequence label = ai.loadLabel(pm); if (label != null) { packageLabels[i] = label.toString(); @@ -268,10 +281,14 @@ public class BatteryEntry { icon = ai.loadIcon(pm); break; } - } catch (PackageManager.NameNotFoundException e) { + } catch (RemoteException e) { + Log.d(PowerUsageSummary.TAG, "Error while retrieving app info for package " + + packageLabels[i] + ", user " + userId, e); } } - if (icon == null) icon = defaultActivityIcon; + if (icon == null) { + icon = defaultActivityIcon; + } if (packageLabels.length == 1) { name = packageLabels[0]; @@ -279,7 +296,12 @@ public class BatteryEntry { // Look for an official name for this UID. for (String pkgName : sipper.mPackages) { try { - final PackageInfo pi = pm.getPackageInfo(pkgName, 0); + final PackageInfo pi = ipm.getPackageInfo(pkgName, 0 /* no flags */, userId); + if (pi == null) { + Log.d(PowerUsageSummary.TAG, "Retrieving null package info for package " + + pkgName + ", user " + userId); + continue; + } if (pi.sharedUserLabel != 0) { final CharSequence nm = pm.getText(pkgName, pi.sharedUserLabel, pi.applicationInfo); @@ -292,7 +314,9 @@ public class BatteryEntry { break; } } - } catch (PackageManager.NameNotFoundException e) { + } catch (RemoteException e) { + Log.d(PowerUsageSummary.TAG, "Error while retrieving package info for package " + + pkgName + ", user " + userId, e); } } } diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index ad8afa5..b26ba65 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -54,7 +54,7 @@ public class PowerUsageSummary extends PreferenceFragment { private static final boolean DEBUG = false; - private static final String TAG = "PowerUsageSummary"; + static final String TAG = "PowerUsageSummary"; private static final String KEY_APP_LIST = "app_list"; @@ -293,7 +293,7 @@ public class PowerUsageSummary extends PreferenceFragment { } final UserHandle userHandle = new UserHandle(UserHandle.getUserId(sipper.getUid())); final BatteryEntry entry = new BatteryEntry(getActivity(), mHandler, mUm, sipper); - final Drawable badgedIcon = mUm.getBadgedDrawableForUser(entry.getIcon(), + final Drawable badgedIcon = mUm.getBadgedIconForUser(entry.getIcon(), userHandle); final CharSequence contentDescription = mUm.getBadgedLabelForUser(entry.getLabel(), userHandle); @@ -337,7 +337,7 @@ public class PowerUsageSummary extends PreferenceFragment { if (pgp != null) { final int userId = UserHandle.getUserId(entry.sipper.getUid()); final UserHandle userHandle = new UserHandle(userId); - pgp.setIcon(mUm.getBadgedDrawableForUser(entry.getIcon(), userHandle)); + pgp.setIcon(mUm.getBadgedIconForUser(entry.getIcon(), userHandle)); pgp.setTitle(entry.name); } break; |