Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9d4d4c6 authored by Evan Severson's avatar Evan Severson
Browse files

Allow multiple permissions in same group to auto grant 

Only ignore if group has been policy fixed and nothing is
granted. Grant permission regardless of whether another
permission in the group is already granted.

Bug: 124453468
Test: Artificially set policy to auto grant and request
      multiple permissions from single group in a test app

Change-Id: I805a3ebce4b2a3df4e6d023d780df534601ea6ca
parent 73092fb1

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+2 −4
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class GrantPermissionsActivity extends Activity 
            reportRequestResult(permission,

                    PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED);

            return;

        } else if (group.isPolicyFixed()) {

        } else if (group.isPolicyFixed() && !group.areRuntimePermissionsGranted()) {

            reportRequestResult(permission,

                    PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED);

            return;
@@ -174,9 +174,7 @@ public class GrantPermissionsActivity extends Activity 
        boolean skipGroup = false;

        switch (getPermissionPolicy()) {

            case DevicePolicyManager.PERMISSION_POLICY_AUTO_GRANT: {

                if (!group.areRuntimePermissionsGranted()) {

                group.grantRuntimePermissions(false, new String[]{permission});

                }

                state.mState = GroupState.STATE_ALLOWED;

                group.setPolicyFixed();

                skipGroup = true;