diff options
author | Benjamin Franz <bfranz@google.com> | 2015-07-09 08:05:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-09 08:05:23 +0000 |
commit | 4c9cc4407cf9dd6fd100a40a221327a5a08d88e8 (patch) | |
tree | 97bfc54313684bf6ad743d2a1af6a6792396968e | |
parent | f6ab90061ecfffdc9aed2827936c5015f5b6b340 (diff) | |
parent | 71f6c4e8fde09bcb2e507f5700d2499032124467 (diff) | |
download | android_packages_apps_PackageInstaller-4c9cc4407cf9dd6fd100a40a221327a5a08d88e8.tar.gz android_packages_apps_PackageInstaller-4c9cc4407cf9dd6fd100a40a221327a5a08d88e8.tar.bz2 android_packages_apps_PackageInstaller-4c9cc4407cf9dd6fd100a40a221327a5a08d88e8.zip |
Merge "Ensure that mixed permission policies return the right result" into mnc-dev
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index f6f1aa1a..8ab7c454 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -136,6 +136,9 @@ public class GrantPermissionsActivity extends Activity mRequestGrantPermissionGroups.put(group.getName(), new GroupState(group)); } break; } + } else { + // if the permission is fixed, ensure that we return the right request result + updateGrantResults(group); } } @@ -232,12 +235,11 @@ public class GrantPermissionsActivity extends Activity private void updateGrantResults(AppPermissionGroup group) { for (Permission permission : group.getPermissions()) { - if (permission.isGranted()) { - final int index = ArrayUtils.getArrayIndex( - mRequestedPermissions, permission.getName()); - if (index >= 0) { - mGrantResults[index] = PackageManager.PERMISSION_GRANTED; - } + final int index = ArrayUtils.getArrayIndex( + mRequestedPermissions, permission.getName()); + if (index >= 0) { + mGrantResults[index] = permission.isGranted() ? PackageManager.PERMISSION_GRANTED + : PackageManager.PERMISSION_DENIED; } } } |