summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2015-12-17 22:41:27 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2015-12-17 22:41:27 (GMT)
commit22d381113c34edf57b7dc231a4b7fbce16a404b6 (patch)
treeb9d53d49dde8657bbb232572a29ad0e632b13ed2
parentdbd2daf3118b76e1cb8ac8aecb870a51dc714020 (diff)
parent58045ad49af12b202b08a4f054a54e2774ca48f1 (diff)
downloadandroid_packages_apps_PackageInstaller-22d381113c34edf57b7dc231a4b7fbce16a404b6.zip
android_packages_apps_PackageInstaller-22d381113c34edf57b7dc231a4b7fbce16a404b6.tar.gz
android_packages_apps_PackageInstaller-22d381113c34edf57b7dc231a4b7fbce16a404b6.tar.bz2
Always have an icon
am: 58045ad49a * commit '58045ad49af12b202b08a4f054a54e2774ca48f1': 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;