diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-08-07 23:09:28 -0700 |
|---|---|---|
| committer | Svet Ganov <svetoslavganov@google.com> | 2015-08-07 23:09:31 -0700 |
| commit | df9104d4144215b6c8612d362fd05427c130fdff (patch) | |
| tree | 460cec013f93fc1711e80db589235f8edd984039 /src | |
| parent | 0c5d3ddf25ca46bf610608f2db8ae8f7371ba318 (diff) | |
| download | android_packages_apps_PackageInstaller-df9104d4144215b6c8612d362fd05427c130fdff.tar.gz android_packages_apps_PackageInstaller-df9104d4144215b6c8612d362fd05427c130fdff.tar.bz2 android_packages_apps_PackageInstaller-df9104d4144215b6c8612d362fd05427c130fdff.zip | |
Do not show removed permissions in the UI - framework
bug:23043018
Change-Id: I32efe93f8c52924263b16d80e09fae1a0a6babf5
Diffstat (limited to 'src')
4 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index 9e06a4a2..633336c3 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -66,7 +66,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> } if (permissionInfo.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS - || (permissionInfo.flags & PermissionInfo.FLAG_INSTALLED) == 0) { + || (permissionInfo.flags & PermissionInfo.FLAG_INSTALLED) == 0 + || (permissionInfo.flags & PermissionInfo.FLAG_HIDDEN) != 0) { return null; } diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java index 9bd114bb..73fc7089 100644 --- a/src/com/android/packageinstaller/permission/model/PermissionApps.java +++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java @@ -179,7 +179,9 @@ public class PermissionApps { if (requestedPermissionInfo.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS || (requestedPermissionInfo.flags - & PermissionInfo.FLAG_INSTALLED) == 0) { + & PermissionInfo.FLAG_INSTALLED) == 0 + || (requestedPermissionInfo.flags + & PermissionInfo.FLAG_HIDDEN) != 0) { continue; } diff --git a/src/com/android/packageinstaller/permission/model/PermissionGroups.java b/src/com/android/packageinstaller/permission/model/PermissionGroups.java index 5fdf76f7..59eba856 100644 --- a/src/com/android/packageinstaller/permission/model/PermissionGroups.java +++ b/src/com/android/packageinstaller/permission/model/PermissionGroups.java @@ -130,7 +130,8 @@ public final class PermissionGroups implements LoaderCallbacks<List<PermissionGr for (PermissionInfo groupPermission : groupPermissions) { seenPermissions.add(groupPermission.name); if (groupPermission.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS - && (groupPermission.flags & PermissionInfo.FLAG_INSTALLED) != 0) { + && (groupPermission.flags & PermissionInfo.FLAG_INSTALLED) != 0 + && (groupPermission.flags & PermissionInfo.FLAG_HIDDEN) == 0) { hasRuntimePermissions = true; } } diff --git a/src/com/android/packageinstaller/permission/ui/AllAppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AllAppPermissionsFragment.java index 9e1c85e4..2fb9a510 100644 --- a/src/com/android/packageinstaller/permission/ui/AllAppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/AllAppPermissionsFragment.java @@ -123,6 +123,11 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader { continue; } + if ((perm.flags & PermissionInfo.FLAG_INSTALLED) == 0 + || (perm.flags & PermissionInfo.FLAG_HIDDEN) != 0) { + continue; + } + if (perm.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) { PermissionGroupInfo group = getGroup(perm.group, pm); PreferenceGroup pref = |