Merge "Add device policy manager namespace to public namespaces" into tm-dev

This commit is contained in:
Kholoud Mohamed
2022-05-13 09:27:17 +00:00
committed by Android (Google) Code Review

View File

@@ -606,6 +606,14 @@ public final class DeviceConfig {
*/ */
public static final String NAMESPACE_VOICE_INTERACTION = "voice_interaction"; 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 * List of namespaces which can be read without READ_DEVICE_CONFIG permission
* *
@@ -614,7 +622,8 @@ public final class DeviceConfig {
@NonNull @NonNull
private static final List<String> PUBLIC_NAMESPACES = private static final List<String> PUBLIC_NAMESPACES =
Arrays.asList(NAMESPACE_TEXTCLASSIFIER, NAMESPACE_RUNTIME, NAMESPACE_STATSD_JAVA, 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. * Privacy related properties definitions.
* *
@@ -738,14 +747,6 @@ public final class DeviceConfig {
*/ */
public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE = "vendor_system_native"; 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(); private static final Object sLock = new Object();
@GuardedBy("sLock") @GuardedBy("sLock")
private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners = private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners =