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

Commit ccfda6a5 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into... 

Merge "Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev am: 13deb7ff am: bd285aaf"
parents 2b39b066 74573bbd

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+2 −1
Original line number Diff line number Diff line
@@ -163,13 +163,14 @@ class PackageManagerShellCommand extends ShellCommand { 
    private static final Map<String, Integer> SUPPORTED_PERMISSION_FLAGS = new ArrayMap<>();

    private static final List<String> SUPPORTED_PERMISSION_FLAGS_LIST;

    static {

        SUPPORTED_PERMISSION_FLAGS_LIST = List.of("review-required", "revoked-compat",

                "revoke-when-requested", "user-fixed", "user-set");

        SUPPORTED_PERMISSION_FLAGS.put("user-set", FLAG_PERMISSION_USER_SET);

        SUPPORTED_PERMISSION_FLAGS.put("user-fixed", FLAG_PERMISSION_USER_FIXED);

        SUPPORTED_PERMISSION_FLAGS.put("revoked-compat", FLAG_PERMISSION_REVOKED_COMPAT);

        SUPPORTED_PERMISSION_FLAGS.put("review-required", FLAG_PERMISSION_REVIEW_REQUIRED);

        SUPPORTED_PERMISSION_FLAGS.put("revoke-when-requested",

                FLAG_PERMISSION_REVOKE_WHEN_REQUESTED);

        SUPPORTED_PERMISSION_FLAGS_LIST = new ArrayList<>(SUPPORTED_PERMISSION_FLAGS.keySet());

    }



    final IPackageManager mInterface;

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -772,8 +772,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
            flagValues &= ~FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT;

            flagValues &= ~FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT;

            flagValues &= ~PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION;

            // REVIEW_REQUIRED can only be set by non-system apps for POST_NOTIFICATIONS, or by the

            // shell or root UID.

            // REVIEW_REQUIRED can be set on any permission by the shell or the root uid, or by

            // any app for the POST_NOTIFICATIONS permission specifically.

            if (!POST_NOTIFICATIONS.equals(permName) && callingUid != Process.SHELL_UID

                    && callingUid != Process.ROOT_UID) {

                flagValues &= ~PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;