Merge "Add information to grant permissions intent for continue messages" (65c07eea) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3321,6 +3321,7 @@ package android.content.pm {
		method @Deprecated @RequiresPermission(android.Manifest.permission.INTENT_FILTER_VERIFICATION_AGENT) public abstract void verifyIntentFilter(int, int, @NonNull java.util.List<java.lang.String>);
		field public static final String ACTION_REQUEST_PERMISSIONS = "android.content.pm.action.REQUEST_PERMISSIONS";
		field public static final String ACTION_REQUEST_PERMISSIONS_FOR_OTHER = "android.content.pm.action.REQUEST_PERMISSIONS_FOR_OTHER";
		field public static final String EXTRA_REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES";
		field public static final String EXTRA_REQUEST_PERMISSIONS_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_NAMES";
		field public static final String EXTRA_REQUEST_PERMISSIONS_RESULTS = "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";
		field public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";

+1 −1

Original line number	Diff line number	Diff line
		@@ -2061,7 +2061,7 @@ package android.permission {
		method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.permission.PermGroupUsage> getIndicatorAppOpUsageData();
		method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.permission.PermGroupUsage> getIndicatorAppOpUsageData(boolean);
		method @NonNull public android.content.AttributionSource registerAttributionSource(@NonNull android.content.AttributionSource);
		method public void revokePostNotificationPermissionWithoutKillForTest(@NonNull String, int);
		method @RequiresPermission(android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL) public void revokePostNotificationPermissionWithoutKillForTest(@NonNull String, int);
		}

		}

+15 −0

Original line number	Diff line number	Diff line
		@@ -4341,6 +4341,21 @@ public abstract class PackageManager {
		public static final String EXTRA_REQUEST_PERMISSIONS_RESULTS
		= "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";

		/**
		* Indicates that the package requesting permissions has legacy access for some permissions,
		* or had it, but it was recently revoked. These request dialogs may show different text,
		* indicating that the app is requesting continued access to a permission. Will be cleared
		* from any permission request intent, if set by a non-system server app.
		* <p>
		* <strong>Type:</strong> String[]
		* </p>
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES
		= "android.content.pm.extra.REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES";

		/**
		* String extra for {@link PackageInstallObserver} in the 'extras' Bundle in case of
		* {@link #INSTALL_FAILED_DUPLICATE_PERMISSION}. This extra names the package which provides

+17 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,12 @@

		package android.permission;

		import static android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_ROLE;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET;
		import static android.os.Build.VERSION_CODES.S;

		import android.Manifest;
		@@ -106,6 +112,16 @@ public final class PermissionManager {
		*/
		public static final int PERMISSION_HARD_DENIED = 2;

		/**
		* The set of flags that indicate that a permission state has been explicitly set
		*
		* @hide
		*/
		public static final int EXPLICIT_SET_FLAGS = FLAG_PERMISSION_USER_SET
		\| FLAG_PERMISSION_USER_FIXED \| FLAG_PERMISSION_POLICY_FIXED
		\| FLAG_PERMISSION_SYSTEM_FIXED \| FLAG_PERMISSION_GRANTED_BY_DEFAULT
		\| FLAG_PERMISSION_GRANTED_BY_ROLE;

		/**
		* Activity action: Launch UI to review permission decisions.
		* <p>
		@@ -1447,6 +1463,7 @@ public final class PermissionManager {
		* @hide
		*/
		@TestApi
		@RequiresPermission(Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL)
		public void revokePostNotificationPermissionWithoutKillForTest(@NonNull String packageName,
		int userId) {
		try {

+7 −4

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ public final class PermissionHelper {
		assertFlag();
		final long callingId = Binder.clearCallingIdentity();
		try {
		if (grant) {
		if (grant && !reviewRequired) {
		mPermManager.grantRuntimePermission(packageName, NOTIFICATION_PERMISSION, userId);
		} else {
		mPermManager.revokeRuntimePermission(packageName, NOTIFICATION_PERMISSION, userId,
		@@ -210,9 +210,11 @@ public final class PermissionHelper {
		if (pkgPerm == null \|\| pkgPerm.packageName == null) {
		return;
		}
		if (!isPermissionFixed(pkgPerm.packageName, pkgPerm.userId)) {
		setNotificationPermission(pkgPerm.packageName, pkgPerm.userId, pkgPerm.granted,
		pkgPerm.userSet, !pkgPerm.userSet);
		}
		}

		public boolean isPermissionFixed(String packageName, @UserIdInt int userId) {
		assertFlag();
		@@ -239,7 +241,8 @@ public final class PermissionHelper {
		try {
		int flags = mPermManager.getPermissionFlags(packageName, NOTIFICATION_PERMISSION,
		userId);
		return (flags & PackageManager.FLAG_PERMISSION_USER_SET) != 0;
		return (flags & (PackageManager.FLAG_PERMISSION_USER_SET
		\| PackageManager.FLAG_PERMISSION_USER_FIXED)) != 0;
		} catch (RemoteException e) {
		Slog.e(TAG, "Could not reach system server", e);
		}