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

Commit fc15bb72 authored by Jenhao Chen's avatar Jenhao Chen Committed by Automerger Merge Worker
Browse files

Merge "Add DeviceConfig namespace for Vendor System Native" into tm-dev am:...

Merge "Add DeviceConfig namespace for Vendor System Native" into tm-dev am: 5a7dafba am: 2865bcff

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



Change-Id: I6e070a348b61bfd603e08092e13655ea8ff1f77f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7a9aff9 2865bcff
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -731,6 +731,13 @@ public final class DeviceConfig {
    public static final String NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE =
            "ambient_context_manager_service";

    /**
     * Namespace for Vendor System Native related features.
     *
     * @hide
     */
    public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE = "vendor_system_native";

    private static final Object sLock = new Object();
    @GuardedBy("sLock")
    private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners =
+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ public class SettingsToPropertiesMapper {
        DeviceConfig.NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT,
        DeviceConfig.NAMESPACE_SWCODEC_NATIVE,
        DeviceConfig.NAMESPACE_TETHERING,
        DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE,
        DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE,
        DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,
    };