diff options
author | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-21 17:33:14 +0000 |
---|---|---|
committer | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-21 17:33:14 +0000 |
commit | 95560c737ad280d1582c4e0bd66dc76a89b6cdc0 (patch) | |
tree | 1d0e740714aa8b0612f438c2dcdb2dbb2baa96f1 /src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | |
parent | e899d8d48558a6d4a8f0498c38a623115aad2205 (diff) | |
download | android_packages_apps_PackageInstaller-95560c737ad280d1582c4e0bd66dc76a89b6cdc0.tar.gz android_packages_apps_PackageInstaller-95560c737ad280d1582c4e0bd66dc76a89b6cdc0.tar.bz2 android_packages_apps_PackageInstaller-95560c737ad280d1582c4e0bd66dc76a89b6cdc0.zip |
Revert "Grant only requested permissions not the whole group."
This reverts commit e899d8d48558a6d4a8f0498c38a623115aad2205.
Bug: 23314383
Bug: 23397858
Change-Id: Ia928a4b24c60eae6b4fb16ebdbfa6b6787f6c3ae
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index a61432e3..c451dd50 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -118,30 +118,21 @@ public class GrantPermissionsActivity extends OverlayTouchActivity if (!group.isUserFixed() && !group.isPolicyFixed()) { switch (permissionPolicy) { case DevicePolicyManager.PERMISSION_POLICY_AUTO_GRANT: { - if (!group.areRuntimePermissionsGranted(mRequestedPermissions)) { - group.grantRuntimePermissions(false, mRequestedPermissions); + if (!group.areRuntimePermissionsGranted()) { + group.grantRuntimePermissions(false); group.setPolicyFixed(); } } break; case DevicePolicyManager.PERMISSION_POLICY_AUTO_DENY: { - if (group.areRuntimePermissionsGranted(mRequestedPermissions)) { - group.revokeRuntimePermissions(false, mRequestedPermissions); + if (!group.areRuntimePermissionsGranted()) { + group.revokeRuntimePermissions(false); group.setPolicyFixed(); } } break; default: { - if (group.areRuntimePermissionsGranted(null) - && !group.areRuntimePermissionsGranted(mRequestedPermissions)) { - // If the group is granted but requested permissions - // in it not we auto grant the these permissions. - group.grantRuntimePermissions(group.isUserFixed(), - mRequestedPermissions); - } else { - mRequestGrantPermissionGroups.put(group.getName(), - new GroupState(group)); - } + mRequestGrantPermissionGroups.put(group.getName(), new GroupState(group)); } break; } } else { @@ -235,10 +226,10 @@ public class GrantPermissionsActivity extends OverlayTouchActivity GroupState groupState = mRequestGrantPermissionGroups.get(name); if (groupState.mGroup != null) { if (granted) { - groupState.mGroup.grantRuntimePermissions(doNotAskAgain, mRequestedPermissions); + groupState.mGroup.grantRuntimePermissions(doNotAskAgain); groupState.mState = GroupState.STATE_ALLOWED; } else { - groupState.mGroup.revokeRuntimePermissions(doNotAskAgain, mRequestedPermissions); + groupState.mGroup.revokeRuntimePermissions(doNotAskAgain); groupState.mState = GroupState.STATE_DENIED; } updateGrantResults(groupState.mGroup); |