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

Commit 70878f92 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

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

core/java/android/provider/DeviceConfig.java

+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 =

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

+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,

    };