am af8c918e: am ab1e5900: Merge "Revert "Grant only requested permissions not the whole group."" into mnc-dev

* commit 'af8c918e6a54c95d35f1e92cb16a4251e1ee7fb8':
  Revert "Grant only requested permissions not the whole group."

2 files changed, 12 insertions, 21 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
index 3277289c..e4e904c8 100644
--- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
@@ -224,7 +224,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
             }
             preference.setPersistent(false);
             preference.setEnabled(!group.isPolicyFixed());
-            preference.setChecked(group.areRuntimePermissionsGranted(null));
+            preference.setChecked(group.areRuntimePermissionsGranted());
 
             if (isPlatform) {
                 screen.addPreference(preference);
@@ -281,7 +281,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
             return false;
         }
         if (newValue == Boolean.TRUE) {
-            group.grantRuntimePermissions(false, null);
+            group.grantRuntimePermissions(false);
         } else {
             final boolean grantedByDefault = group.hasGrantedByDefaultPermission();
             if (grantedByDefault || (!group.hasRuntimePermission() && !mHasConfirmedRevoke)) {
@@ -294,7 +294,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 ((SwitchPreference) preference).setChecked(false);
-                                group.revokeRuntimePermissions(false, null);
+                                group.revokeRuntimePermissions(false);
                                 if (!grantedByDefault) {
                                     mHasConfirmedRevoke = true;
                                 }
@@ -303,7 +303,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
                         .show();
                 return false;
             } else {
-                group.revokeRuntimePermissions(false, null);
+                group.revokeRuntimePermissions(false);
             }
         }
 
@@ -351,7 +351,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
                 SwitchPreference switchPref = (SwitchPreference) preference;
                 AppPermissionGroup group = mAppPermissions.getPermissionGroup(switchPref.getKey());
                 if (group != null) {
-                    switchPref.setChecked(group.areRuntimePermissionsGranted(null));
+                    switchPref.setChecked(group.areRuntimePermissionsGranted());
                 }
             }
         }
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index e10932a7..c55267e0 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -120,30 +120,21 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
             if (!group.isUserFixed() && !group.isPolicyFixed()) {
                 switch (permissionPolicy) {
                     case DevicePolicyManager.PERMISSION_POLICY_AUTO_GRANT: {
-                        if (!group.areRuntimePermissionsGranted(mRequestedPermissions)) {
-                            group.grantRuntimePermissions(false, mRequestedPermissions);
+                        if (!group.areRuntimePermissionsGranted()) {
+                            group.grantRuntimePermissions(false);
                             group.setPolicyFixed();
                         }
                     } break;
 
                     case DevicePolicyManager.PERMISSION_POLICY_AUTO_DENY: {
-                        if (group.areRuntimePermissionsGranted(mRequestedPermissions)) {
-                            group.revokeRuntimePermissions(false, mRequestedPermissions);
+                        if (!group.areRuntimePermissionsGranted()) {
+                            group.revokeRuntimePermissions(false);
                             group.setPolicyFixed();
                         }
                     } break;
 
                     default: {
-                        if (group.areRuntimePermissionsGranted(null)
-                                && !group.areRuntimePermissionsGranted(mRequestedPermissions)) {
-                            // If the group is granted but requested permissions
-                            // in it not we auto grant the these permissions.
-                            group.grantRuntimePermissions(group.isUserFixed(),
-                                    mRequestedPermissions);
-                        } else {
-                            mRequestGrantPermissionGroups.put(group.getName(),
-                                    new GroupState(group));
-                        }
+                        mRequestGrantPermissionGroups.put(group.getName(), new GroupState(group));
                     } break;
                 }
             } else {
@@ -237,10 +228,10 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
         GroupState groupState = mRequestGrantPermissionGroups.get(name);
         if (groupState.mGroup != null) {
             if (granted) {
-                groupState.mGroup.grantRuntimePermissions(doNotAskAgain, mRequestedPermissions);
+                groupState.mGroup.grantRuntimePermissions(doNotAskAgain);
                 groupState.mState = GroupState.STATE_ALLOWED;
             } else {
-                groupState.mGroup.revokeRuntimePermissions(doNotAskAgain, mRequestedPermissions);
+                groupState.mGroup.revokeRuntimePermissions(doNotAskAgain);
                 groupState.mState = GroupState.STATE_DENIED;
             }
             updateGrantResults(groupState.mGroup);