Merge "Add device policy manager namespace to public namespaces" into tm-dev (8293974f) · Commits · e / os / android_frameworks_base

core/java/android/provider/DeviceConfig.java

+10 −9

Original line number	Diff line number	Diff line
		@@ -606,6 +606,14 @@ public final class DeviceConfig {
		*/
		public static final String NAMESPACE_VOICE_INTERACTION = "voice_interaction";

		/**
		* Namespace for DevicePolicyManager related features.
		*
		* @hide
		*/
		public static final String NAMESPACE_DEVICE_POLICY_MANAGER =
		"device_policy_manager";

		/**
		* List of namespaces which can be read without READ_DEVICE_CONFIG permission
		*
		@@ -614,7 +622,8 @@ public final class DeviceConfig {
		@NonNull
		private static final List<String> PUBLIC_NAMESPACES =
		Arrays.asList(NAMESPACE_TEXTCLASSIFIER, NAMESPACE_RUNTIME, NAMESPACE_STATSD_JAVA,
		NAMESPACE_STATSD_JAVA_BOOT, NAMESPACE_SELECTION_TOOLBAR, NAMESPACE_AUTOFILL);
		NAMESPACE_STATSD_JAVA_BOOT, NAMESPACE_SELECTION_TOOLBAR, NAMESPACE_AUTOFILL,
		NAMESPACE_DEVICE_POLICY_MANAGER);
		/**
		* Privacy related properties definitions.
		*
		@@ -738,14 +747,6 @@ public final class DeviceConfig {
		*/
		public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE = "vendor_system_native";

		/**
		* Namespace for DevicePolicyManager related features.
		*
		* @hide
		*/
		public static final String NAMESPACE_DEVICE_POLICY_MANAGER =
		"device_policy_manager";

		private static final Object sLock = new Object();
		@GuardedBy("sLock")
		private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners =