diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-09 22:00:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-09 22:00:01 -0700 |
| commit | 5716d5b8e853ced35bbc4ffa51302fc7276f3470 (patch) | |
| tree | 4149bf7f583a300ffb5e093ca9ac2dd73d8a7609 | |
| parent | e4d18337497cd53ab311fa95acf89951b2d0d478 (diff) | |
| parent | df27c8179ea9b6ed1c1a16049bdf541091c3126b (diff) | |
| download | android_packages_apps_PackageInstaller-5716d5b8e853ced35bbc4ffa51302fc7276f3470.tar.gz android_packages_apps_PackageInstaller-5716d5b8e853ced35bbc4ffa51302fc7276f3470.tar.bz2 android_packages_apps_PackageInstaller-5716d5b8e853ced35bbc4ffa51302fc7276f3470.zip | |
Merge "Make storage permission only show one configration."
| -rw-r--r--[-rwxr-xr-x] | src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java index f4e59625..b5f57ad0 100755..100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java @@ -30,6 +30,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PermissionInfo; import android.graphics.drawable.Drawable; +import android.Manifest; import android.net.Uri; import android.os.Bundle; import android.preference.Preference; @@ -243,24 +244,25 @@ public final class AppPermissionsFragment extends SettingsWithHeader } if (AppPermissionGroup.isStrictOpEnable() && isPlatform) { try { - PackageManager pm = context.getPackageManager(); - for (Permission permission : group.getPermissions()) { - PermissionInfo perm = pm.getPermissionInfo(permission.getName(), 0); - final String[] filterPermissions = new String[]{permission.getName()}; - - if (perm.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) { - SwitchPreference preference_permission = new SwitchPreference(context); - preference_permission.setOnPreferenceChangeListener(this); - preference_permission.setKey(permission.getName()); - preference_permission.setTitle(perm.loadLabel(pm)); - preference_permission.setPersistent(false); - preference_permission.setEnabled(true); - AppPermissionGroup permissionGroup = getPermisssionGroup(perm.group); - preference_permission.setChecked( - permissionGroup.areRuntimePermissionsGranted(filterPermissions)); - screen.addPreference(preference_permission); - } else if (perm.protectionLevel == PermissionInfo.PROTECTION_NORMAL) { - continue; + if (!group.getName().equals(Manifest.permission_group.STORAGE)) { + PackageManager pm = context.getPackageManager(); + for (Permission permission : group.getPermissions()) { + PermissionInfo perm = pm.getPermissionInfo(permission.getName(), 0); + final String[] filterPermissions = new String[]{permission.getName()}; + if (perm.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) { + SwitchPreference preference_permission = new SwitchPreference(context); + preference_permission.setOnPreferenceChangeListener(this); + preference_permission.setKey(permission.getName()); + preference_permission.setTitle(perm.loadLabel(pm)); + preference_permission.setPersistent(false); + preference_permission.setEnabled(true); + AppPermissionGroup permissionGroup = getPermisssionGroup(perm.group); + preference_permission.setChecked( + permissionGroup.areRuntimePermissionsGranted(filterPermissions)); + screen.addPreference(preference_permission); + } else if (perm.protectionLevel == PermissionInfo.PROTECTION_NORMAL) { + continue; + } } } } catch (NameNotFoundException e) { @@ -302,6 +304,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader } private void updateEveryPermissionPreference(AppPermissionGroup group) { + if (group.getName().equals(Manifest.permission_group.STORAGE)) return; PackageManager pm = getContext().getPackageManager(); PreferenceScreen screen = getPreferenceScreen(); for (Permission permission : group.getPermissions()) { |