Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename ACTION_MEMTAG_SETTINGS"

Browse Source
This commit is contained in:
Florian Mayer
2022-11-30 01:26:36 +00:00
committed by Android (Google) Code Review
parent 9ec600d356 b69eb624e5
commit 65c303e35f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -35877,6 +35877,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";
@@ -35925,7 +35926,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";

6
core/java/android/provider/Settings.java
View File

@@ -708,7 +708,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.
* <p>
* 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.
@@ -720,8 +720,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