From 766cd208b4f427d2535ab7c71beaf50b3ced04e2 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Fri, 3 Jul 2015 15:51:24 -0700 Subject: 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 --- .../packageinstaller/permission/model/AppPermissionGroup.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') 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 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) { -- cgit v1.2.3