diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-10-15 22:39:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 22:39:08 +0000 |
commit | 16bd317af077269cdb5604d631fdeef051faf865 (patch) | |
tree | 6eeac9f1d98d73576eb43a431f218de422bba271 /src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | |
parent | 7307dc71a7897b88135ed72dc85f64e4658a8ac6 (diff) | |
parent | 6986f29bb93a6aaaeaaddcab081d0e0afd7082e8 (diff) | |
download | android_packages_apps_PackageInstaller-16bd317af077269cdb5604d631fdeef051faf865.tar.gz android_packages_apps_PackageInstaller-16bd317af077269cdb5604d631fdeef051faf865.tar.bz2 android_packages_apps_PackageInstaller-16bd317af077269cdb5604d631fdeef051faf865.zip |
am 6986f29b: Auto grant permissions in an already granted group.
* commit '6986f29bb93a6aaaeaaddcab081d0e0afd7082e8':
Auto grant permissions in an already granted group.
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 20 |
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 { |