diff options
author | Julia Reynolds <juliacr@google.com> | 2015-07-09 18:58:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-09 18:58:13 +0000 |
commit | 279678e1ffc72090a56a1ccd7f782d3c7c0b228f (patch) | |
tree | 20b1c50e11c11ef1efa3f5d42a9ddcf76b7403db | |
parent | 5859910463df29324df868f30e0ff66440cf161f (diff) | |
parent | d1af446feb66d4a095ff18a90c0c4c7ff1d57220 (diff) | |
download | frameworks_base-279678e1ffc72090a56a1ccd7f782d3c7c0b228f.zip frameworks_base-279678e1ffc72090a56a1ccd7f782d3c7c0b228f.tar.gz frameworks_base-279678e1ffc72090a56a1ccd7f782d3c7c0b228f.tar.bz2 |
Merge "Show a default icon for permissions that lack a group." into mnc-dev
-rw-r--r-- | core/java/android/widget/AppSecurityPermissions.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/java/android/widget/AppSecurityPermissions.java b/core/java/android/widget/AppSecurityPermissions.java index c54b28d..d1af9dc 100644 --- a/core/java/android/widget/AppSecurityPermissions.java +++ b/core/java/android/widget/AppSecurityPermissions.java @@ -98,18 +98,12 @@ public class AppSecurityPermissions { super(info); } - public Drawable loadGroupIcon(PackageManager pm) { + public Drawable loadGroupIcon(Context context, PackageManager pm) { if (icon != 0) { return loadUnbadgedIcon(pm); } else { - ApplicationInfo appInfo; - try { - appInfo = pm.getApplicationInfo(packageName, 0); - return appInfo.loadUnbadgedIcon(pm); - } catch (NameNotFoundException e) { - } + return context.getDrawable(R.drawable.ic_perm_device_info); } - return null; } } @@ -163,7 +157,7 @@ public class AppSecurityPermissions { PackageManager pm = getContext().getPackageManager(); Drawable icon = null; if (first) { - icon = grp.loadGroupIcon(pm); + icon = grp.loadGroupIcon(getContext(), pm); } CharSequence label = perm.mLabel; if (perm.mNew && newPermPrefix != null) { @@ -213,7 +207,7 @@ public class AppSecurityPermissions { builder.setMessage(sbuilder.toString()); } builder.setCancelable(true); - builder.setIcon(mGroup.loadGroupIcon(pm)); + builder.setIcon(mGroup.loadGroupIcon(getContext(), pm)); addRevokeUIIfNecessary(builder); mDialog = builder.show(); mDialog.setCanceledOnTouchOutside(true); |