diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-05-22 15:03:21 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-05-22 15:03:21 -0700 |
| commit | e6a93e8a1ea2025ac18edf8f3a043847a67295ce (patch) | |
| tree | 57e64f7d43ffde33a6e560766368e9b3463087e1 /src | |
| parent | 61ec20409e7acb0ad043b1ca295e97d5bba079cd (diff) | |
| download | android_packages_apps_PackageInstaller-e6a93e8a1ea2025ac18edf8f3a043847a67295ce.tar.gz android_packages_apps_PackageInstaller-e6a93e8a1ea2025ac18edf8f3a043847a67295ce.tar.bz2 android_packages_apps_PackageInstaller-e6a93e8a1ea2025ac18edf8f3a043847a67295ce.zip | |
Do not hide additional permissions behind the show legacy option
Change-Id: I8a2b07e6cd199332cfb283de4c22d9400831edba
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java index 3efc35dc..f328dd8a 100644 --- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java @@ -235,8 +235,11 @@ public final class AppPermissionsFragment extends SettingsWithHeader continue; } + final boolean isPlatformPermission = group.getDeclaringPackage().equals(OS_PKG); + // Show legacy permissions only if the user chose that. - if (!mShowLegacyPermissions && !Utils.isModernPermissionGroup(group.getName())) { + if (isPlatformPermission && !mShowLegacyPermissions + && !Utils.isModernPermissionGroup(group.getName())) { continue; } @@ -252,7 +255,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader preference.setEnabled(!group.isPolicyFixed()); preference.setChecked(group.areRuntimePermissionsGranted()); - if (group.getDeclaringPackage().equals(OS_PKG)) { + if (isPlatformPermission) { screen.addPreference(preference); } else { if (mExtraScreen == null) { |