diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-06 15:49:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 15:49:33 +0000 |
| commit | 8b22848e736ed37f7359f9296d6968be057669ed (patch) | |
| tree | 155036b21d35541cf891e06c41fb5f55429fa3ce /src | |
| parent | d8fcbcd19e99244476c74b80c1a0e6e63ddba229 (diff) | |
| parent | 766cd208b4f427d2535ab7c71beaf50b3ced04e2 (diff) | |
| download | android_packages_apps_PackageInstaller-8b22848e736ed37f7359f9296d6968be057669ed.tar.gz android_packages_apps_PackageInstaller-8b22848e736ed37f7359f9296d6968be057669ed.tar.bz2 android_packages_apps_PackageInstaller-8b22848e736ed37f7359f9296d6968be057669ed.zip | |
Merge "Reflect the proper permission group state in the UI" into mnc-dev
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) { |