From e3031c98ba7af889cb85bd415f334a2f9b45b77d Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Tue, 31 Jan 2023 14:59:11 -0800
Subject: [PATCH] Use bootloader_override from boot namespace

Bug: 267234468
Change-Id: I6e6229504a452d8a82f8928a79e10b342478524c
---
 src/com/android/settings/security/MemtagHelper.java           | 4 ++--
 .../src/com/android/settings/security/MemtagHelperTest.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/security/MemtagHelper.java b/src/com/android/settings/security/MemtagHelper.java
index b3e24e493e3..9fd74f329ff 100644
--- a/src/com/android/settings/security/MemtagHelper.java
+++ b/src/com/android/settings/security/MemtagHelper.java
@@ -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() {
diff --git a/tests/robotests/src/com/android/settings/security/MemtagHelperTest.java b/tests/robotests/src/com/android/settings/security/MemtagHelperTest.java
index 2b9ecf707d6..3d38bbc86b6 100644
--- a/tests/robotests/src/com/android/settings/security/MemtagHelperTest.java
+++ b/tests/robotests/src/com/android/settings/security/MemtagHelperTest.java
@@ -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() {