summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2015-12-17 14:50:15 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-17 14:50:15 -0800
commitee5e9f9a3403f0f5864962aa287404468673b7b9 (patch)
treec515bc9331b804c36a36177aaa518f2624f75c89 /src
parent65b0badb518f281f3278b8e0b54c35f01cb59f94 (diff)
parenta7c9313497142dbf8c18849f5b7c6959eed69a73 (diff)
downloadandroid_packages_apps_PackageInstaller-ee5e9f9a3403f0f5864962aa287404468673b7b9.tar.gz
android_packages_apps_PackageInstaller-ee5e9f9a3403f0f5864962aa287404468673b7b9.tar.bz2
android_packages_apps_PackageInstaller-ee5e9f9a3403f0f5864962aa287404468673b7b9.zip
Always have an icon am: 58045ad49a am: 22d381113c am: 5e0bd5c976
am: a7c9313497 * commit 'a7c9313497142dbf8c18849f5b7c6959eed69a73': Always have an icon
Diffstat (limited to 'src')
-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 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;