diff --git a/core/api/current.txt b/core/api/current.txt index a3738f767dd5c..5cfd3ecf16ff3 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -35777,6 +35777,7 @@ package android.provider { method public static boolean canDrawOverlays(android.content.Context); field public static final String ACTION_ACCESSIBILITY_SETTINGS = "android.settings.ACCESSIBILITY_SETTINGS"; field public static final String ACTION_ADD_ACCOUNT = "android.settings.ADD_ACCOUNT_SETTINGS"; + field public static final String ACTION_ADVANCED_MEMORY_PROTECTION_SETTINGS = "android.settings.ADVANCED_MEMORY_PROTECTION_SETTINGS"; field public static final String ACTION_AIRPLANE_MODE_SETTINGS = "android.settings.AIRPLANE_MODE_SETTINGS"; field public static final String ACTION_ALL_APPS_NOTIFICATION_SETTINGS = "android.settings.ALL_APPS_NOTIFICATION_SETTINGS"; field public static final String ACTION_APN_SETTINGS = "android.settings.APN_SETTINGS"; @@ -35824,7 +35825,6 @@ package android.provider { field public static final String ACTION_MANAGE_UNKNOWN_APP_SOURCES = "android.settings.MANAGE_UNKNOWN_APP_SOURCES"; field public static final String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS"; field public static final String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS"; - field public static final String ACTION_MEMTAG_SETTINGS = "android.settings.MEMTAG_SETTINGS"; field public static final String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS"; field public static final String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS"; field public static final String ACTION_NFC_PAYMENT_SETTINGS = "android.settings.NFC_PAYMENT_SETTINGS"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 52b1adb876fcf..fc3e5fba6b31c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -690,7 +690,7 @@ public final class Settings { "android.settings.WIFI_SETTINGS"; /** - * Activity Action: Show settings to allow configuration of MTE. + * Activity Action: Show settings to allow configuration of Advanced memory protection. *
* Memory Tagging Extension (MTE) is a CPU extension that allows to protect against certain * classes of security problems at a small runtime performance cost overhead. @@ -702,8 +702,8 @@ public final class Settings { * Output: Nothing. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_MEMTAG_SETTINGS = - "android.settings.MEMTAG_SETTINGS"; + public static final String ACTION_ADVANCED_MEMORY_PROTECTION_SETTINGS = + "android.settings.ADVANCED_MEMORY_PROTECTION_SETTINGS"; /** * Activity Action: Show settings to allow configuration of a static IP