Merge "Add FLAG_PERMISSION_REVOKED_COMPAT." (a4322fa1) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -1663,7 +1663,8 @@ package android.content.pm {
		field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000
		field public static final int FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT = 8192; // 0x2000
		field public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 64; // 0x40
		field public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 8; // 0x8
		field public static final int FLAG_PERMISSION_REVOKED_COMPAT = 8; // 0x8
		field @Deprecated public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 8; // 0x8
		field public static final int FLAG_PERMISSION_SYSTEM_FIXED = 16; // 0x10
		field public static final int FLAG_PERMISSION_USER_FIXED = 2; // 0x2
		field public static final int FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED = 512; // 0x200
		@@ -1731,7 +1732,7 @@ package android.content.pm {
		method public void onPermissionsChanged(int);
		}

		@IntDef(prefix={"FLAG_PERMISSION_"}, value={android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET, android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE, android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_ROLE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface PackageManager.PermissionFlags {
		@IntDef(prefix={"FLAG_PERMISSION_"}, value={android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET, android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE, android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_ROLE, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKED_COMPAT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface PackageManager.PermissionFlags {
		}

		public class PermissionGroupInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

api/test-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -739,7 +739,8 @@ package android.content.pm {
		field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000
		field public static final int FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT = 8192; // 0x2000
		field public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 64; // 0x40
		field public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 8; // 0x8
		field public static final int FLAG_PERMISSION_REVOKED_COMPAT = 8; // 0x8
		field @Deprecated public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 8; // 0x8
		field public static final int FLAG_PERMISSION_REVOKE_WHEN_REQUESTED = 128; // 0x80
		field public static final int FLAG_PERMISSION_SYSTEM_FIXED = 16; // 0x10
		field public static final int FLAG_PERMISSION_USER_FIXED = 2; // 0x2

core/java/android/content/pm/PackageManager.java

+20 −3

Original line number	Diff line number	Diff line
		@@ -3078,8 +3078,11 @@ public abstract class PackageManager {
		* because the app was updated to support runtime permissions, the
		* the permission will be revoked in the upgrade process.
		*
		* @deprecated Renamed to {@link #FLAG_PERMISSION_REVOKED_COMPAT}.
		*
		* @hide
		*/
		@Deprecated
		@SystemApi
		@TestApi
		public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 1 << 3;
		@@ -3201,6 +3204,18 @@ public abstract class PackageManager {
		@TestApi
		public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 1 << 15;

		/**
		* Permission flag: The permission should have been revoked but is kept granted for
		* compatibility. The data protected by the permission should be protected by a no-op (empty
		* list, default error, etc) instead of crashing the client. The permission will be revoked if
		* the app is upgraded to supports it.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final int FLAG_PERMISSION_REVOKED_COMPAT = FLAG_PERMISSION_REVOKE_ON_UPGRADE;

		/**
		* Permission flags: Bitwise or of all permission flags allowing an
		* exemption for a restricted permission.
		@@ -3241,7 +3256,8 @@ public abstract class PackageManager {
		\| FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT
		\| FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT
		\| FLAG_PERMISSION_APPLY_RESTRICTION
		\| FLAG_PERMISSION_GRANTED_BY_ROLE;
		\| FLAG_PERMISSION_GRANTED_BY_ROLE
		\| FLAG_PERMISSION_REVOKED_COMPAT;

		/**
		* Injected activity in app that forwards user to setting activity of that app.
		@@ -4017,7 +4033,8 @@ public abstract class PackageManager {
		FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT,
		FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT,
		FLAG_PERMISSION_APPLY_RESTRICTION,
		FLAG_PERMISSION_GRANTED_BY_ROLE
		FLAG_PERMISSION_GRANTED_BY_ROLE,
		FLAG_PERMISSION_REVOKED_COMPAT
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface PermissionFlags {}
		@@ -7086,7 +7103,6 @@ public abstract class PackageManager {
		case FLAG_PERMISSION_POLICY_FIXED: return "POLICY_FIXED";
		case FLAG_PERMISSION_SYSTEM_FIXED: return "SYSTEM_FIXED";
		case FLAG_PERMISSION_USER_SET: return "USER_SET";
		case FLAG_PERMISSION_REVOKE_ON_UPGRADE: return "REVOKE_ON_UPGRADE";
		case FLAG_PERMISSION_USER_FIXED: return "USER_FIXED";
		case FLAG_PERMISSION_REVIEW_REQUIRED: return "REVIEW_REQUIRED";
		case FLAG_PERMISSION_REVOKE_WHEN_REQUESTED: return "REVOKE_WHEN_REQUESTED";
		@@ -7097,6 +7113,7 @@ public abstract class PackageManager {
		case FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT: return "RESTRICTION_UPGRADE_EXEMPT";
		case FLAG_PERMISSION_APPLY_RESTRICTION: return "APPLY_RESTRICTION";
		case FLAG_PERMISSION_GRANTED_BY_ROLE: return "GRANTED_BY_ROLE";
		case FLAG_PERMISSION_REVOKED_COMPAT: return "REVOKED_COMPAT";
		default: return Integer.toString(flag);
		}
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
		import static android.content.pm.PackageManager.DELETE_KEEP_DATA;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKED_COMPAT;
		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;
		@@ -1592,7 +1592,7 @@ public class PackageManagerService extends IPackageManager.Stub
		private static final int USER_RUNTIME_GRANT_MASK =
		FLAG_PERMISSION_USER_SET
		\| FLAG_PERMISSION_USER_FIXED
		\| FLAG_PERMISSION_REVOKE_ON_UPGRADE;
		\| FLAG_PERMISSION_REVOKED_COMPAT;

		final @Nullable String mRequiredVerifierPackage;
		final @NonNull String mRequiredInstallerPackage;

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import static android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTIO
		import static android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKED_COMPAT;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_WHEN_REQUESTED;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED;
		import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED;
		@@ -1514,7 +1514,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		// These are flags that can change base on user actions.
		final int userSettableMask = FLAG_PERMISSION_USER_SET
		\| FLAG_PERMISSION_USER_FIXED
		\| FLAG_PERMISSION_REVOKE_ON_UPGRADE
		\| FLAG_PERMISSION_REVOKED_COMPAT
		\| FLAG_PERMISSION_REVIEW_REQUIRED;

		final int policyOrSystemFlags = FLAG_PERMISSION_SYSTEM_FIXED
		@@ -1624,7 +1624,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		final int uid = mPackageManagerInt.getPackageUid(packageName, 0, userId);
		final int targetSdk = mPackageManagerInt.getUidTargetSdkVersion(uid);
		final int flags = (targetSdk < Build.VERSION_CODES.M && bp.isRuntime())
		? FLAG_PERMISSION_REVIEW_REQUIRED \| FLAG_PERMISSION_REVOKE_ON_UPGRADE
		? FLAG_PERMISSION_REVIEW_REQUIRED \| FLAG_PERMISSION_REVOKED_COMPAT
		: 0;

		updatePermissionFlagsInternal(
		@@ -2536,8 +2536,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		wasChanged = true;
		}

		if ((flags & FLAG_PERMISSION_REVOKE_ON_UPGRADE) != 0) {
		flags &= ~FLAG_PERMISSION_REVOKE_ON_UPGRADE;
		if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0) {
		flags &= ~FLAG_PERMISSION_REVOKED_COMPAT;
		wasChanged = true;
		// Hard restricted permissions cannot be held.
		} else if (!permissionPolicyInitialized
		@@ -2556,7 +2556,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		bp.getSourcePackageName())) {
		if (!bp.isRemoved()) {
		flags \|= FLAG_PERMISSION_REVIEW_REQUIRED
		\| FLAG_PERMISSION_REVOKE_ON_UPGRADE;
		\| FLAG_PERMISSION_REVOKED_COMPAT;
		wasChanged = true;
		}
		}
		@@ -2671,8 +2671,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		wasChanged = true;
		}

		if ((flags & FLAG_PERMISSION_REVOKE_ON_UPGRADE) != 0) {
		flags &= ~FLAG_PERMISSION_REVOKE_ON_UPGRADE;
		if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0) {
		flags &= ~FLAG_PERMISSION_REVOKED_COMPAT;
		wasChanged = true;
		// Hard restricted permissions cannot be held.
		} else if (!permissionPolicyInitialized \|\|