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

Commit ec201f92 authored by Florian Mayer's avatar Florian Mayer Committed by Android (Google) Code Review
Browse files

Merge "Sync memory_safety_native device config to native properties."

parents 9855c5c9 e67ab990

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 memory safety related features (e.g. MTE)

     *

     * @hide

     */

    public static final String NAMESPACE_MEMORY_SAFETY_NATIVE = "memory_safety_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
@@ -101,6 +101,7 @@ public class SettingsToPropertiesMapper { 
        DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE,

        DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE,

        DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE,

    };



    private final String[] mGlobalSettings;