diff options
author | Ian Pedowitz <ijpedowitz@google.com> | 2015-10-15 18:27:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 18:27:48 +0000 |
commit | 552691509242ad469eb45b797346cc56966c836f (patch) | |
tree | b72b2272d9f38a29a36274b4fd58a03eaef33eb0 /src/com/android/packageinstaller/permission/ui | |
parent | 0cf6be8b8afed230ca248a73e8e310e4bc0b3ea8 (diff) | |
parent | 7307dc71a7897b88135ed72dc85f64e4658a8ac6 (diff) | |
download | android_packages_apps_PackageInstaller-552691509242ad469eb45b797346cc56966c836f.tar.gz android_packages_apps_PackageInstaller-552691509242ad469eb45b797346cc56966c836f.tar.bz2 android_packages_apps_PackageInstaller-552691509242ad469eb45b797346cc56966c836f.zip |
am 7307dc71: am 86f1ee8c: Revert "Auto grant permissions in an already granted group."
* commit '7307dc71a7897b88135ed72dc85f64e4658a8ac6':
Revert "Auto grant permissions in an already granted group."
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 20 |
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 { |