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

Commit bd285aaf authored Apr 28, 2022 by Nate Myren Committed by Automerger Merge Worker Apr 28, 2022

Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev am: 13deb7ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17805782

Change-Id: Ibc035362a3ded726c437da825b01b4101a78e927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 00dc18a8 13deb7ff

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -159,13 +159,14 @@ class PackageManagerShellCommand extends ShellCommand {
	private static final Map<String, Integer> SUPPORTED_PERMISSION_FLAGS = new ArrayMap<>();		private static final Map<String, Integer> SUPPORTED_PERMISSION_FLAGS = new ArrayMap<>();
	private static final List<String> SUPPORTED_PERMISSION_FLAGS_LIST;		private static final List<String> SUPPORTED_PERMISSION_FLAGS_LIST;
	static {		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-set", FLAG_PERMISSION_USER_SET);
	SUPPORTED_PERMISSION_FLAGS.put("user-fixed", FLAG_PERMISSION_USER_FIXED);		SUPPORTED_PERMISSION_FLAGS.put("user-fixed", FLAG_PERMISSION_USER_FIXED);
	SUPPORTED_PERMISSION_FLAGS.put("revoked-compat", FLAG_PERMISSION_REVOKED_COMPAT);		SUPPORTED_PERMISSION_FLAGS.put("revoked-compat", FLAG_PERMISSION_REVOKED_COMPAT);
	SUPPORTED_PERMISSION_FLAGS.put("review-required", FLAG_PERMISSION_REVIEW_REQUIRED);		SUPPORTED_PERMISSION_FLAGS.put("review-required", FLAG_PERMISSION_REVIEW_REQUIRED);
	SUPPORTED_PERMISSION_FLAGS.put("revoke-when-requested",		SUPPORTED_PERMISSION_FLAGS.put("revoke-when-requested",
	FLAG_PERMISSION_REVOKE_WHEN_REQUESTED);		FLAG_PERMISSION_REVOKE_WHEN_REQUESTED);
	SUPPORTED_PERMISSION_FLAGS_LIST = new ArrayList<>(SUPPORTED_PERMISSION_FLAGS.keySet());
	}		}

	final IPackageManager mInterface;		final IPackageManager mInterface;

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -767,8 +767,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
	flagValues &= ~FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT;		flagValues &= ~FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT;
	flagValues &= ~FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT;		flagValues &= ~FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT;
	flagValues &= ~PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION;		flagValues &= ~PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION;
	// REVIEW_REQUIRED can only be set by non-system apps for POST_NOTIFICATIONS, or by the		// REVIEW_REQUIRED can be set on any permission by the shell or the root uid, or by
	// shell or root UID.		// any app for the POST_NOTIFICATIONS permission specifically.
	if (!POST_NOTIFICATIONS.equals(permName) && callingUid != Process.SHELL_UID		if (!POST_NOTIFICATIONS.equals(permName) && callingUid != Process.SHELL_UID
	&& callingUid != Process.ROOT_UID) {		&& callingUid != Process.ROOT_UID) {
	flagValues &= ~PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;		flagValues &= ~PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;