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

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

Merge "Use bootloader_override from boot namespace"

parents 73d72245 e3031c98

src/com/android/settings/security/MemtagHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ public class MemtagHelper { 
        return "force_off"

                .equals(

                        SystemProperties.get(

                                "persist.device_config.memory_safety_native.bootloader_override"));

                                "persist.device_config.memory_safety_native_boot.bootloader_override"));

    }



    private static boolean isForcedOn() {

        return "force_on"

                .equals(

                        SystemProperties.get(

                                "persist.device_config.memory_safety_native.bootloader_override"));

                                "persist.device_config.memory_safety_native_boot.bootloader_override"));

    }



    public static boolean isChecked() {

tests/robotests/src/com/android/settings/security/MemtagHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public class MemtagHelperTest { 
    private final String mMemtagProperty = "arm64.memtag.bootctl";

    private final String mMemtagSupportedProperty = "ro.arm64.memtag.bootctl_settings_toggle";

    private final String mDeviceConfigOverride =

            "persist.device_config.memory_safety_native.bootloader_override";

            "persist.device_config.memory_safety_native_boot.bootloader_override";



    @Test

    public void isChecked_empty_isFalse() {