diff options
author | Svet Ganov <svetoslavganov@google.com> | 2015-07-03 15:51:24 -0700 |
---|---|---|
committer | Svet Ganov <svetoslavganov@google.com> | 2015-07-03 15:51:27 -0700 |
commit | 766cd208b4f427d2535ab7c71beaf50b3ced04e2 (patch) | |
tree | 15fe2bed5057eef8148c8c8c5724759596768163 /src | |
parent | 30366743234bbdcbd2f6f638e3d6c364207a9400 (diff) | |
download | android_packages_apps_PackageInstaller-766cd208b4f427d2535ab7c71beaf50b3ced04e2.tar.gz android_packages_apps_PackageInstaller-766cd208b4f427d2535ab7c71beaf50b3ced04e2.tar.bz2 android_packages_apps_PackageInstaller-766cd208b4f427d2535ab7c71beaf50b3ced04e2.zip |
Reflect the proper permission group state in the UI
A pemrission group is granted when at least one permission is
granted as opposed to all permissions being granted.
bug:22195416
Change-Id: I0bf7a8ec56380f89edc775a82c7f9d4f8e8f8245
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index 6bd15aff..59130c44 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -258,15 +258,15 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> for (int i = 0; i < permissionCount; i++) { Permission permission = mPermissions.valueAt(i); if (mAppSupportsRuntimePermissions) { - if (!permission.isGranted()) { - return false; + if (permission.isGranted()) { + return true; } } else if (permission.isGranted() && permission.getAppOp() - != AppOpsManager.OP_NONE && !permission.isAppOpAllowed()) { - return false; + != AppOpsManager.OP_NONE && permission.isAppOpAllowed()) { + return true; } } - return true; + return false; } public boolean grantRuntimePermissions(boolean fixedByTheUser) { |