Merge "Add device policy manager namespace to public namespaces" into tm-dev am: 8293974f3a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344246

Change-Id: I3da3c36af1db0200341b8aed9becc9294ce57e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kholoud Mohamed
2022-05-13 10:22:31 +00:00
committed by Automerger Merge Worker

View File

@@ -613,6 +613,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
*
@@ -621,7 +629,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.
*
@@ -745,14 +754,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 =