Merge "Added a new set of permissions for DeviceConfig API." (24527094) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −0

api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -420,6 +420,7 @@ package android.content.pm {
	}		}

	public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {		public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
			field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000
	field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000		field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000
	field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000		field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000
	field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000		field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

core/java/android/content/pm/PackageManagerInternal.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -55,6 +55,7 @@ public abstract class PackageManagerInternal {
	public static final int PACKAGE_PERMISSION_CONTROLLER = 6;		public static final int PACKAGE_PERMISSION_CONTROLLER = 6;
	public static final int PACKAGE_WELLBEING = 7;		public static final int PACKAGE_WELLBEING = 7;
	public static final int PACKAGE_DOCUMENTER = 8;		public static final int PACKAGE_DOCUMENTER = 8;
			public static final int PACKAGE_CONFIGURATOR = 9;
	@IntDef(value = {		@IntDef(value = {
	PACKAGE_SYSTEM,		PACKAGE_SYSTEM,
	PACKAGE_SETUP_WIZARD,		PACKAGE_SETUP_WIZARD,
	@@ -65,6 +66,7 @@ public abstract class PackageManagerInternal {
	PACKAGE_PERMISSION_CONTROLLER,		PACKAGE_PERMISSION_CONTROLLER,
	PACKAGE_WELLBEING,		PACKAGE_WELLBEING,
	PACKAGE_DOCUMENTER,		PACKAGE_DOCUMENTER,
			PACKAGE_CONFIGURATOR,
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface KnownPackage {}		public @interface KnownPackage {}

core/java/android/content/pm/PermissionInfo.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -203,6 +203,16 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
	@TestApi		@TestApi
	public static final int PROTECTION_FLAG_DOCUMENTER = 0x40000;		public static final int PROTECTION_FLAG_DOCUMENTER = 0x40000;

			/**
			* Additional flag for {@link #protectionLevel}, corresponding to the
			* {@code configurator} value of {@link android.R.attr#protectionLevel}.
			*
			* @hide
			*/
			@SystemApi
			@TestApi
			public static final int PROTECTION_FLAG_CONFIGURATOR = 0x80000;


	/** @hide */		/** @hide */
	@IntDef(flag = true, prefix = { "PROTECTION_FLAG_" }, value = {		@IntDef(flag = true, prefix = { "PROTECTION_FLAG_" }, value = {
	@@ -222,6 +232,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
	PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER,		PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER,
	PROTECTION_FLAG_WELLBEING,		PROTECTION_FLAG_WELLBEING,
	PROTECTION_FLAG_DOCUMENTER,		PROTECTION_FLAG_DOCUMENTER,
			PROTECTION_FLAG_CONFIGURATOR,
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface ProtectionFlags {}		public @interface ProtectionFlags {}
	@@ -417,6 +428,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
	if ((level & PermissionInfo.PROTECTION_FLAG_DOCUMENTER) != 0) {		if ((level & PermissionInfo.PROTECTION_FLAG_DOCUMENTER) != 0) {
	protLevel += "\|documenter";		protLevel += "\|documenter";
	}		}
			if ((level & PROTECTION_FLAG_CONFIGURATOR) != 0) {
			protLevel += "\|configurator";
			}
	return protLevel;		return protLevel;
	}		}

core/java/android/provider/DeviceConfig.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,9 +16,13 @@

	package android.provider;		package android.provider;

			import static android.Manifest.permission.READ_DEVICE_CONFIG;
			import static android.Manifest.permission.WRITE_DEVICE_CONFIG;

	import android.annotation.CallbackExecutor;		import android.annotation.CallbackExecutor;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.annotation.RequiresPermission;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.app.ActivityThread;		import android.app.ActivityThread;
	import android.content.ContentResolver;		import android.content.ContentResolver;
	@@ -78,6 +82,7 @@ public final class DeviceConfig {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@RequiresPermission(READ_DEVICE_CONFIG)
	public static String getProperty(String namespace, String name) {		public static String getProperty(String namespace, String name) {
	ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();		ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();
	String compositeName = createCompositeName(namespace, name);		String compositeName = createCompositeName(namespace, name);
	@@ -105,6 +110,7 @@ public final class DeviceConfig {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@RequiresPermission(WRITE_DEVICE_CONFIG)
	public static boolean setProperty(		public static boolean setProperty(
	String namespace, String name, String value, boolean makeDefault) {		String namespace, String name, String value, boolean makeDefault) {
	ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();		ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();
	@@ -125,6 +131,7 @@ public final class DeviceConfig {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@RequiresPermission(WRITE_DEVICE_CONFIG)
	public static void resetToDefaults(@ResetMode int resetMode, @Nullable String namespace) {		public static void resetToDefaults(@ResetMode int resetMode, @Nullable String namespace) {
	ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();		ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver();
	Settings.Config.resetToDefaults(contentResolver, resetMode, namespace);		Settings.Config.resetToDefaults(contentResolver, resetMode, namespace);
	@@ -146,10 +153,12 @@ public final class DeviceConfig {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@RequiresPermission(READ_DEVICE_CONFIG)
	public static void addOnPropertyChangedListener(		public static void addOnPropertyChangedListener(
	@NonNull String namespace,		@NonNull String namespace,
	@NonNull @CallbackExecutor Executor executor,		@NonNull @CallbackExecutor Executor executor,
	@NonNull OnPropertyChangedListener onPropertyChangedListener) {		@NonNull OnPropertyChangedListener onPropertyChangedListener) {
			// TODO enforce READ_DEVICE_CONFIG permission
	synchronized (sLock) {		synchronized (sLock) {
	Pair<String, Executor> oldNamespace = sListeners.get(onPropertyChangedListener);		Pair<String, Executor> oldNamespace = sListeners.get(onPropertyChangedListener);
	if (oldNamespace == null) {		if (oldNamespace == null) {