Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

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;