From 58045ad49af12b202b08a4f054a54e2774ca48f1 Mon Sep 17 00:00:00 2001
From: Todd Kennedy <toddke@google.com>
Date: Tue, 24 Nov 2015 11:52:03 -0800
Subject: 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
---
 .../android/packageinstaller/permission/model/PermissionGroups.java  | 5 +++--
 1 file 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;
-- 
cgit v1.2.3