Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c09ed961 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I909bc72a670a15aaaeeb455d3b70d1e99d6f7828
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62805b5b 3dcc8455

core/java/android/provider/DeviceConfig.java

+10 −9
Original line number Diff line number Diff line
@@ -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 =