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

Commit 62c25380 authored by Richard Chang's avatar Richard Chang Committed by Android (Google) Code Review
Browse files

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

parents aa8f8a95 2ccae742
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -747,6 +747,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 =
+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,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,
    };