From 00307bdbbed545e741671c823267757e2fd8279c Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Wed, 16 Nov 2022 14:14:12 -0800
Subject: [PATCH] Add separate system property to control user toggle

This allows to ship the developer toggle independent of the settings
toggle. This also allows other parts of the system to query whether the
settings toggle is available.

Bug: 244290023
Change-Id: I1a6b6457974a7107711cd4f7d990a6fe61bf340f
---
 src/com/android/settings/security/MemtagHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/security/MemtagHelper.java b/src/com/android/settings/security/MemtagHelper.java
index ecd6ea63cdf..c891eb24c27 100644
--- a/src/com/android/settings/security/MemtagHelper.java
+++ b/src/com/android/settings/security/MemtagHelper.java
@@ -46,7 +46,7 @@ public class MemtagHelper {
         if (MemtagHelper.isForcedOff()) {
             return BasePreferenceController.DISABLED_DEPENDENT_SETTING;
         }
-        return SystemProperties.getBoolean("ro.arm64.memtag.bootctl_supported", false)
+        return SystemProperties.getBoolean("ro.arm64.memtag.bootctl_settings_toggle", false)
                 ? BasePreferenceController.AVAILABLE
                 : BasePreferenceController.UNSUPPORTED_ON_DEVICE;
     }