diff options
| author | 2022-05-13 17:36:05 +0000 | |
|---|---|---|
| committer | 2022-05-13 17:36:05 +0000 | |
| commit | 38c1a7916326326bd9501c29c30a0ef98f8315cc (patch) | |
| tree | 563fb678dbe3269ba44b3a48280aeca86fd1b9f1 | |
| parent | 3676e7afd67a94f43dc64484863c1f4b4bdc5776 (diff) | |
| parent | 1368e8a55dbddafc4d9eb3cfa46f2f186b3cdcea (diff) | |
Merge "Add device policy manager namespace to public namespaces" into tm-dev am: 8293974f3a am: 1368e8a55d
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>
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 9a2f7baa7265..13a3ec8c0562 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -607,6 +607,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 * * @hide @@ -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 = |