From e972d206084f860ac56062b4732eaeb7da2bdfe2 Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Fri, 27 Jan 2023 01:05:18 +0000
Subject: [PATCH] Revert "[MTE] Move toggle to dev options"

This reverts commit c70ffd6b3b9a9f03cb545119d03642a720a324df.

Reason for revert: Let's keep this and create a new one for persistent dev toggle.

Change-Id: I4d90f04f95c149ce8a75c8fa6872736a02c8a659
---
 res/xml/development_settings.xml       | 8 --------
 res/xml/security_advanced_settings.xml | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 4a508ef20b3..2bc1b87a50c 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -48,14 +48,6 @@
             android:key="reboot_with_mte"
             android:title="@string/reboot_with_mte_title" />
 
-        <com.android.settingslib.RestrictedPreference
-                android:id="@+id/memtag_page"
-                android:key="memtag_page"
-                android:title="@string/memtag_title"
-                settings:keywords="@string/keywords_memtag"
-                android:fragment="com.android.settings.security.MemtagPage"
-                settings:controller="com.android.settings.security.MemtagPagePreferenceController" />
-
         <Preference
             android:key="local_backup_password"
             android:title="@string/local_backup_password_title"
diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml
index f57ab9a1255..4db078e97ba 100644
--- a/res/xml/security_advanced_settings.xml
+++ b/res/xml/security_advanced_settings.xml
@@ -107,6 +107,15 @@
         settings:isPreferenceVisible="@bool/config_show_sim_info"
         settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController" />
 
+  <com.android.settingslib.RestrictedPreference
+        android:order="100"
+        android:id="@+id/memtag_page"
+        android:key="memtag_page"
+        android:title="@string/memtag_title"
+        settings:keywords="@string/keywords_memtag"
+        android:fragment="com.android.settings.security.MemtagPage"
+        settings:controller="com.android.settings.security.MemtagPagePreferenceController" />
+
     <!-- work profile security section -->
     <PreferenceCategory
         android:order="110"