diff options
author | Svet Ganov <svetoslavganov@google.com> | 2015-05-19 10:36:36 -0700 |
---|---|---|
committer | Svet Ganov <svetoslavganov@google.com> | 2015-05-19 10:36:41 -0700 |
commit | 3621be40b6f4464081902f601ee57ff8d3131656 (patch) | |
tree | 732f907fd73dac20d37075d483a2112acd7a166b | |
parent | 267c2bd39c248eea2679c0a8efa334d3155e262c (diff) | |
download | android_packages_apps_PackageInstaller-3621be40b6f4464081902f601ee57ff8d3131656.tar.gz android_packages_apps_PackageInstaller-3621be40b6f4464081902f601ee57ff8d3131656.tar.bz2 android_packages_apps_PackageInstaller-3621be40b6f4464081902f601ee57ff8d3131656.zip |
Fix wrong permission group placement under the legacy permission list.
bug:21195624
Change-Id: I20b2b3385219f33629e5607dc0a20a2df6f8e013
-rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 9 | ||||
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index e3c9160a..5c40c32e 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -171,8 +171,13 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> mDeclaringPackage = declaringPackage; mName = name; mLabel = label; - mIconPkg = iconPkg; - mIconResId = iconResId != 0 ? iconResId : R.drawable.ic_perm_device_info; + if (iconResId != 0) { + mIconPkg = iconPkg; + mIconResId = iconResId; + } else { + mIconPkg = context.getPackageName(); + mIconResId = R.drawable.ic_perm_device_info; + } } public boolean hasRuntimePermission() { diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java index 79e66246..2dc548c2 100644 --- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java @@ -243,7 +243,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader preference.setPersistent(false); preference.setEnabled(!group.isPolicyFixed()); - if (group.getIconPkg().equals(OS_PKG)) { + if (group.getDeclaringPackage().equals(OS_PKG)) { screen.addPreference(preference); } else { if (mExtraScreen == null) { |