summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2015-12-17 22:44:10 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2015-12-17 22:44:10 (GMT)
commit5e0bd5c9764158b60626f6e56d4aaa118aeda6cf (patch)
tree283b7d9b81e550257e4092328f00e4667237855b
parent8f3d04a4883ed3cf8f43488fd4ccd6600ebd9043 (diff)
parent22d381113c34edf57b7dc231a4b7fbce16a404b6 (diff)
downloadandroid_packages_apps_PackageInstaller-5e0bd5c9764158b60626f6e56d4aaa118aeda6cf.zip
android_packages_apps_PackageInstaller-5e0bd5c9764158b60626f6e56d4aaa118aeda6cf.tar.gz
android_packages_apps_PackageInstaller-5e0bd5c9764158b60626f6e56d4aaa118aeda6cf.tar.bz2
Always have an icon am: 58045ad49a
am: 22d381113c * commit '22d381113c34edf57b7dc231a4b7fbce16a404b6': Always have an icon
-rw-r--r--src/com/android/packageinstaller/permission/model/PermissionGroups.java5
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 59eba85..c496e89 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;