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

Commit 27ede876 authored by Richard Chang's avatar Richard Chang Committed by Automerger Merge Worker
Browse files

Merge "Add DeviceConfig namespace for Vendor System Native Boot" into tm-qpr-dev am: 62c25380 

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



Change-Id: Id0d1887e8d8705afc4a68065d722d00efdc43c7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e2ef9a7 62c25380

core/java/android/provider/DeviceConfig.java

+7 −0
Original line number Diff line number Diff line
@@ -754,6 +754,13 @@ public final class DeviceConfig { 
     */

    public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE = "vendor_system_native";



    /**

     * Namespace for Vendor System Native Boot related features.

     *

     * @hide

     */

    public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE_BOOT = "vendor_system_native_boot";



    private static final Object sLock = new Object();

    @GuardedBy("sLock")

    private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners =

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ public class SettingsToPropertiesMapper { 
        DeviceConfig.NAMESPACE_SWCODEC_NATIVE,

        DeviceConfig.NAMESPACE_TETHERING,

        DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE,

        DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE,

        DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,

    };