summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-10-15 18:13:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-15 18:13:47 +0000
commitd6d074169d960647ac275a8a05a873a9993d6b09 (patch)
tree6eeac9f1d98d73576eb43a431f218de422bba271
parentadf405b0881079ef6518c1a04af7d302fbfae29b (diff)
parentc7e595a22c11247b3e6b0fbfa324542321ab9d14 (diff)
downloadandroid_packages_apps_PackageInstaller-d6d074169d960647ac275a8a05a873a9993d6b09.tar.gz
android_packages_apps_PackageInstaller-d6d074169d960647ac275a8a05a873a9993d6b09.tar.bz2
android_packages_apps_PackageInstaller-d6d074169d960647ac275a8a05a873a9993d6b09.zip
am c7e595a2: Auto grant permissions in an already granted group.
* commit 'c7e595a22c11247b3e6b0fbfa324542321ab9d14': Auto grant permissions in an already granted group.
-rw-r--r--src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index bb4dde7e..ffa8bf35 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, mRequestedPermissions, false,
+ mAppPermissions = new AppPermissions(this, callingPackageInfo, null, false,
new Runnable() {
@Override
public void run() {
@@ -116,6 +116,16 @@ 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()) {
@@ -135,7 +145,13 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
} break;
default: {
- mRequestGrantPermissionGroups.put(group.getName(), new GroupState(group));
+ if (!group.areRuntimePermissionsGranted()) {
+ mRequestGrantPermissionGroups.put(group.getName(),
+ new GroupState(group));
+ } else {
+ group.grantRuntimePermissions(false);
+ updateGrantResults(group);
+ }
} break;
}
} else {