PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use bootloader_override from boot namespace"

Browse Source
This commit is contained in:
Florian Mayer
2023-02-03 22:26:50 +00:00
committed by Android (Google) Code Review
parent 73d7224561 e3031c98ba
commit d540e02be8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/security/MemtagHelper.java
View File

@@ -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() {

2
tests/robotests/src/com/android/settings/security/MemtagHelperTest.java
View File

@@ -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() {