Merge "Implement dual-permission model for storage." (8c6eee11) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -339,6 +339,7 @@ package android.app {
		field public static final String OPSTR_GET_ACCOUNTS = "android:get_accounts";
		field public static final String OPSTR_GPS = "android:gps";
		field public static final String OPSTR_INSTANT_APP_START_FOREGROUND = "android:instant_app_start_foreground";
		field public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage";
		field public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels";
		field public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone";
		field public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells";
		@@ -1649,6 +1650,7 @@ package android.content.pm {
		field public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";
		field public static final String FEATURE_TELEPHONY_CARRIERLOCK = "android.hardware.telephony.carrierlock";
		field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20
		field public static final int FLAG_PERMISSION_HIDDEN = 1024; // 0x400
		field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4
		field public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 64; // 0x40
		field public static final int FLAG_PERMISSION_REVOKE_ON_UPGRADE = 8; // 0x8
		@@ -1719,7 +1721,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}) @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_HIDDEN}) @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 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,7 @@ package android.app {
		field public static final String OPSTR_GET_ACCOUNTS = "android:get_accounts";
		field public static final String OPSTR_GPS = "android:gps";
		field public static final String OPSTR_INSTANT_APP_START_FOREGROUND = "android:instant_app_start_foreground";
		field public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage";
		field public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels";
		field public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone";
		field public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells";
		@@ -659,6 +660,7 @@ package android.content.pm {
		method @RequiresPermission(anyOf={"android.permission.GRANT_RUNTIME_PERMISSIONS", "android.permission.REVOKE_RUNTIME_PERMISSIONS"}) public abstract void updatePermissionFlags(String, String, int, int, @NonNull android.os.UserHandle);
		field public static final String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";
		field public static final String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";
		field public static final int FLAG_PERMISSION_HIDDEN = 1024; // 0x400
		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_REVOKE_WHEN_REQUESTED = 128; // 0x80

core/java/android/app/AppOpsManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import android.util.LongSparseLongArray;
		import android.util.SparseArray;

		import com.android.internal.annotations.GuardedBy;

		import com.android.internal.annotations.Immutable;
		import com.android.internal.app.IAppOpsActiveCallback;
		import com.android.internal.app.IAppOpsCallback;
		@@ -1098,6 +1097,8 @@ public class AppOpsManager {
		/** @hide Write media of image type. */
		public static final String OPSTR_WRITE_MEDIA_IMAGES = "android:write_media_images";
		/** @hide Has a legacy (non-isolated) view of storage. */
		@TestApi
		@SystemApi
		public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage";
		/** @hide Interact with accessibility. */
		@SystemApi

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

+12 −1

Original line number	Diff line number	Diff line
		@@ -3064,6 +3064,15 @@ public abstract class PackageManager {
		@SystemApi
		public static final int FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED = 1 << 9;

		/**
		* Permission flag: The permission should not be shown in the UI.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final int FLAG_PERMISSION_HIDDEN = 1 << 10;

		/**
		* Mask for all permission flags present in Android P
		*
		@@ -3082,7 +3091,7 @@ public abstract class PackageManager {
		*
		* @hide
		*/
		public static final int MASK_PERMISSION_FLAGS_ALL = 0x3FF;
		public static final int MASK_PERMISSION_FLAGS_ALL = 0x7FF;

		/**
		* Injected activity in app that forwards user to setting activity of that app.
		@@ -3793,6 +3802,7 @@ public abstract class PackageManager {
		FLAG_PERMISSION_GRANTED_BY_DEFAULT,
		FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED,
		FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED,
		FLAG_PERMISSION_HIDDEN,
		/*
		FLAG_PERMISSION_REVOKE_WHEN_REQUESED
		*/
		@@ -6586,6 +6596,7 @@ public abstract class PackageManager {
		case FLAG_PERMISSION_REVOKE_WHEN_REQUESTED: return "REVOKE_WHEN_REQUESTED";
		case FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED: return "USER_SENSITIVE_WHEN_GRANTED";
		case FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED: return "USER_SENSITIVE_WHEN_DENIED";
		case FLAG_PERMISSION_HIDDEN: return "HIDDEN";
		default: return Integer.toString(flag);
		}
		}

core/res/AndroidManifest.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -819,8 +819,7 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_sdcardRead"
		android:description="@string/permdesc_sdcardRead"
		android:protectionLevel="dangerous"
		android:permissionFlags="removed" />
		android:protectionLevel="dangerous" />

		<!-- Allows an application to write to external storage.
		<p class="note"><strong>Note:</strong> If <em>both</em> your <a
		@@ -841,8 +840,7 @@
		android:permissionGroup="android.permission-group.UNDEFINED"
		android:label="@string/permlab_sdcardWrite"
		android:description="@string/permdesc_sdcardWrite"
		android:protectionLevel="dangerous"
		android:permissionFlags="removed" />
		android:protectionLevel="dangerous" />

		<!-- Runtime permission controlling access to the user's shared aural media
		collection. -->