diff options
| author | Jason Monk <jmonk@google.com> | 2015-05-13 16:06:53 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-05-13 16:06:53 -0400 |
| commit | ee3326a1516659ea4d4120621b0f30755f58ea48 (patch) | |
| tree | f0014473e64da86a64cc674e0a79b37fc1323c2a /src | |
| parent | c3582acfa0b9d65b29a7e19cc55551fbbdddbc4e (diff) | |
| download | android_packages_apps_PackageInstaller-ee3326a1516659ea4d4120621b0f30755f58ea48.tar.gz android_packages_apps_PackageInstaller-ee3326a1516659ea4d4120621b0f30755f58ea48.tar.bz2 android_packages_apps_PackageInstaller-ee3326a1516659ea4d4120621b0f30755f58ea48.zip | |
Add default permission icon
Bug: 21119477
Change-Id: I9961276c8fe5fbc3658174dd8e00cff85e34b685
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/PermissionApps.java | 6 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/PermissionGroup.java | 3 |
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 451b5d9e..cf4a617b 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 PackageInfo getApp() { |