diff options
author | Todd Kennedy <toddke@google.com> | 2015-11-24 11:52:03 -0800 |
---|---|---|
committer | Todd Kennedy <toddke@google.com> | 2015-11-24 13:47:49 -0800 |
commit | e3ba0f72cf3a38d5f196b10f976dfe4c5dd5dff5 (patch) | |
tree | bbe93a065ad17659a7e80a8bc94efd4e3d25909a /src/com/android/packageinstaller/permission/model | |
parent | 8790fe1d01c50be82f7b5a90f85c1e111a28a2c3 (diff) | |
download | android_packages_apps_PackageInstaller-e3ba0f72cf3a38d5f196b10f976dfe4c5dd5dff5.tar.gz android_packages_apps_PackageInstaller-e3ba0f72cf3a38d5f196b10f976dfe4c5dd5dff5.tar.bz2 android_packages_apps_PackageInstaller-e3ba0f72cf3a38d5f196b10f976dfe4c5dd5dff5.zip |
Always have an icon
The permission icon can be an external icon and thus might not exist.
So, ensure we always have an icon for the permissions UI.
Bug: 25602523
Change-Id: Ibdb1f296ff8c5f3664fe8056c8637844b580cce9
Diffstat (limited to 'src/com/android/packageinstaller/permission/model')
-rw-r--r-- | src/com/android/packageinstaller/permission/model/PermissionGroups.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/model/PermissionGroups.java b/src/com/android/packageinstaller/permission/model/PermissionGroups.java index 59eba856..c496e898 100644 --- a/src/com/android/packageinstaller/permission/model/PermissionGroups.java +++ b/src/com/android/packageinstaller/permission/model/PermissionGroups.java @@ -212,11 +212,12 @@ public final class PermissionGroups implements LoaderCallbacks<List<PermissionGr } private Drawable loadItemInfoIcon(PackageItemInfo itemInfo) { - final Drawable icon; + Drawable icon = null; if (itemInfo.icon > 0) { icon = Utils.loadDrawable(getContext().getPackageManager(), itemInfo.packageName, itemInfo.icon); - } else { + } + if (icon == null) { icon = getContext().getDrawable(R.drawable.ic_perm_device_info); } return icon; |