summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2015-10-15 18:16:19 +0000
committerIan Pedowitz <ijpedowitz@google.com>2015-10-15 18:16:19 +0000
commit86f1ee8c2db04d37d48f25a60086e5a27a812fb9 (patch)
treeb6f0519818fcedc4366abfd98ae337ad7869c46b
parentc7e595a22c11247b3e6b0fbfa324542321ab9d14 (diff)
downloadandroid_packages_apps_PackageInstaller-86f1ee8c2db04d37d48f25a60086e5a27a812fb9.tar.gz
android_packages_apps_PackageInstaller-86f1ee8c2db04d37d48f25a60086e5a27a812fb9.tar.bz2
android_packages_apps_PackageInstaller-86f1ee8c2db04d37d48f25a60086e5a27a812fb9.zip
Revert "Auto grant permissions in an already granted group."
This reverts commit c7e595a22c11247b3e6b0fbfa324542321ab9d14. Change-Id: I0a319ef590e9c0f830af470155213677bed684f4
-rw-r--r--src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index 56b3f466..aaa65f9e 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -104,7 +104,7 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
return;
}
- mAppPermissions = new AppPermissions(this, callingPackageInfo, null, false,
+ mAppPermissions = new AppPermissions(this, callingPackageInfo, mRequestedPermissions, false,
new Runnable() {
@Override
public void run() {
@@ -113,16 +113,6 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
});
for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {
- boolean groupHasRequestedPermission = false;
- for (String requestedPermission : mRequestedPermissions) {
- if (group.hasPermission(requestedPermission)) {
- groupHasRequestedPermission = true;
- break;
- }
- }
- if (!groupHasRequestedPermission) {
- continue;
- }
// We allow the user to choose only non-fixed permissions. A permission
// is fixed either by device policy or the user denying with prejudice.
if (!group.isUserFixed() && !group.isPolicyFixed()) {
@@ -142,13 +132,7 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
} break;
default: {
- if (!group.areRuntimePermissionsGranted()) {
- mRequestGrantPermissionGroups.put(group.getName(),
- new GroupState(group));
- } else {
- group.grantRuntimePermissions(false);
- updateGrantResults(group);
- }
+ mRequestGrantPermissionGroups.put(group.getName(), new GroupState(group));
} break;
}
} else {