Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1dd8a8c3fdc9fccb3d24fca7746cd249ff50097c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kholoud Mohamed
2022-05-13 17:36:05 +00:00
committed by Automerger Merge Worker
parent 3676e7afd6 1368e8a55d
commit 38c1a79163
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/provider/DeviceConfig.java
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 =