2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java
index 70edbbcc..81e5af51 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionApps.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java
@@ -96,7 +96,11 @@ public class PermissionApps {
             }
         }
         mLabel = info.loadLabel(mPm);
-        mIcon = info.loadUnbadgedIcon(mPm);
+        if (info.icon != 0) {
+            mIcon = info.loadUnbadgedIcon(mPm);
+        } else {
+            mIcon = mContext.getDrawable(com.android.internal.R.drawable.ic_perm_device_info);
+        }
         LightingColorFilter filter = new LightingColorFilter(0, 0xffffffff);
         mIcon.setColorFilter(filter);
     }
diff --git a/src/com/android/packageinstaller/permission/model/PermissionGroup.java b/src/com/android/packageinstaller/permission/model/PermissionGroup.java
index 3a197184..1f20e442 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionGroup.java
@@ -169,7 +169,8 @@ public final class PermissionGroup implements Comparable<PermissionGroup> {
         mName = name;
         mLabel = label;
         mIconPkg = iconPkg;
-        mIconResId = iconResId;
+        mIconResId = iconResId != 0 ? iconResId
+                : com.android.internal.R.drawable.ic_perm_device_info;
     }
 
     public boolean isAppOpPermission() {