diff options
author | Ian Pedowitz <ijpedowitz@google.com> | 2015-10-15 18:35:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-15 18:35:59 +0000 |
commit | d2b9f88a67562599cb431359b45399d791ff6a92 (patch) | |
tree | b7f836bf2ab83c322b7338a50ed6d16985c9d51e /src | |
parent | b4d2e0e84a20c0c2a12ec0d75fb11f32e48fe8df (diff) | |
parent | 02f2bd58b7db479fd3f52cbe4ba9d20ae36c5aa0 (diff) | |
download | android_packages_apps_PackageInstaller-d2b9f88a67562599cb431359b45399d791ff6a92.tar.gz android_packages_apps_PackageInstaller-d2b9f88a67562599cb431359b45399d791ff6a92.tar.bz2 android_packages_apps_PackageInstaller-d2b9f88a67562599cb431359b45399d791ff6a92.zip |
am 02f2bd58: am 55269150: am 7307dc71: am 86f1ee8c: Revert "Auto grant permissions in an already granted group."
* commit '02f2bd58b7db479fd3f52cbe4ba9d20ae36c5aa0':
Revert "Auto grant permissions in an already granted group."
Diffstat (limited to 'src')
-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 { |