diff options
author | Svetoslav <svetoslavganov@google.com> | 2015-07-22 14:27:20 -0700 |
---|---|---|
committer | Svetoslav <svetoslavganov@google.com> | 2015-07-22 14:27:23 -0700 |
commit | 5f4122f779781cbee945a99ffe00b44d1dcf5ff5 (patch) | |
tree | 803057bd6b87ede107abede4fb73065ccfddd28a /src/com/android/packageinstaller/permission/model | |
parent | 97d7b7a694afdd62adf4607be65717548eec40b5 (diff) | |
download | android_packages_apps_PackageInstaller-5f4122f779781cbee945a99ffe00b44d1dcf5ff5.tar.gz android_packages_apps_PackageInstaller-5f4122f779781cbee945a99ffe00b44d1dcf5ff5.tar.bz2 android_packages_apps_PackageInstaller-5f4122f779781cbee945a99ffe00b44d1dcf5ff5.zip |
Ingore not installed permissions in the UI
bug:22303510
Change-Id: Ieab8da041627e6a5807d00a72a1ec73f1cca821b
Diffstat (limited to 'src/com/android/packageinstaller/permission/model')
3 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index efd4bd10..17910446 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -65,7 +65,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> return null; } - if (permissionInfo.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS) { + if (permissionInfo.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS + || (permissionInfo.flags & PermissionInfo.FLAG_INSTALLED) == 0) { return null; } diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java index 844374a0..9bd114bb 100644 --- a/src/com/android/packageinstaller/permission/model/PermissionApps.java +++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java @@ -177,7 +177,9 @@ public class PermissionApps { } if (requestedPermissionInfo.protectionLevel - != PermissionInfo.PROTECTION_DANGEROUS) { + != PermissionInfo.PROTECTION_DANGEROUS + || (requestedPermissionInfo.flags + & PermissionInfo.FLAG_INSTALLED) == 0) { continue; } diff --git a/src/com/android/packageinstaller/permission/model/PermissionGroups.java b/src/com/android/packageinstaller/permission/model/PermissionGroups.java index 8ed3ebb0..5fdf76f7 100644 --- a/src/com/android/packageinstaller/permission/model/PermissionGroups.java +++ b/src/com/android/packageinstaller/permission/model/PermissionGroups.java @@ -129,7 +129,8 @@ public final class PermissionGroups implements LoaderCallbacks<List<PermissionGr // Cache seen permissions and see if group has runtime permissions. for (PermissionInfo groupPermission : groupPermissions) { seenPermissions.add(groupPermission.name); - if (groupPermission.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) { + if (groupPermission.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS + && (groupPermission.flags & PermissionInfo.FLAG_INSTALLED) != 0) { hasRuntimePermissions = true; } } @@ -176,8 +177,9 @@ public final class PermissionGroups implements LoaderCallbacks<List<PermissionGr continue; } - // We care only about runtime permissions. - if (permissionInfo.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS) { + // We care only about installed runtime permissions. + if (permissionInfo.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS + || (permissionInfo.flags & PermissionInfo.FLAG_INSTALLED) == 0) { continue; } |