summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2015-10-15 18:22:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-15 18:22:51 +0000
commit7307dc71a7897b88135ed72dc85f64e4658a8ac6 (patch)
tree1a0adb64b63cf8371b96ead60769cf86e3e6ada7 /src
parentd6d074169d960647ac275a8a05a873a9993d6b09 (diff)
parent86f1ee8c2db04d37d48f25a60086e5a27a812fb9 (diff)
downloadandroid_packages_apps_PackageInstaller-7307dc71a7897b88135ed72dc85f64e4658a8ac6.tar.gz
android_packages_apps_PackageInstaller-7307dc71a7897b88135ed72dc85f64e4658a8ac6.tar.bz2
android_packages_apps_PackageInstaller-7307dc71a7897b88135ed72dc85f64e4658a8ac6.zip
am 86f1ee8c: Revert "Auto grant permissions in an already granted group."
* commit '86f1ee8c2db04d37d48f25a60086e5a27a812fb9': Revert "Auto grant permissions in an already granted group."
Diffstat (limited to 'src')
-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 ffa8bf35..bb4dde7e 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -107,7 +107,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() {
@@ -116,16 +116,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()) {
@@ -145,13 +135,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 {