From ac3a78dd5d7cea7e5f97436fccda25c2086a9cec Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Mon, 18 Apr 2022 15:07:52 -0700 Subject: Sort list of flags, change comment about REVIEW_REQUIRED Bug: 229321394 Test: build Change-Id: I34d9fa44899957062eca421a3f76308ee964acbf --- .../core/java/com/android/server/pm/PackageManagerShellCommand.java | 3 ++- .../android/server/pm/permission/PermissionManagerServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 78a600e34dae..6b10d4c17527 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -159,13 +159,14 @@ class PackageManagerShellCommand extends ShellCommand { private static final Map SUPPORTED_PERMISSION_FLAGS = new ArrayMap<>(); private static final List 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; diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 74f6296ef4eb..1332e3d358e6 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -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; -- cgit v1.2.3-59-g8ed1b