diff options
| author | 2023-11-29 17:10:34 +0000 | |
|---|---|---|
| committer | 2023-11-29 17:10:34 +0000 | |
| commit | 567d3ebd94557bdd14dd1d99c2f3395ba8d20a56 (patch) | |
| tree | 0266788f619c9829b0a60081d174381ee7f2cfbb | |
| parent | c82b6e66b01a6a249dae83c681791400cca3ae6c (diff) | |
| parent | 8ca2aaf26befdfd1cd6c78e529a709e86ee0eadf (diff) | |
Merge "Flag new Credential Manager settings intent" into main
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 805ecd43e3c7..5b339fa9494d 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -36822,7 +36822,7 @@ package android.provider { field public static final String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS"; field public static final String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS"; field public static final String ACTION_CONDITION_PROVIDER_SETTINGS = "android.settings.ACTION_CONDITION_PROVIDER_SETTINGS"; - field public static final String ACTION_CREDENTIAL_PROVIDER = "android.settings.CREDENTIAL_PROVIDER"; + field @FlaggedApi("android.credentials.flags.new_settings_intents") public static final String ACTION_CREDENTIAL_PROVIDER = "android.settings.CREDENTIAL_PROVIDER"; field public static final String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS"; field public static final String ACTION_DATA_USAGE_SETTINGS = "android.settings.DATA_USAGE_SETTINGS"; field public static final String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8f18c5f58c7e..7f64400a1cce 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2542,6 +2542,7 @@ public final class Settings { * ComponentName)} and only use this action to start an activity if they return {@code false}. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + @FlaggedApi(android.credentials.flags.Flags.FLAG_NEW_SETTINGS_INTENTS) public static final String ACTION_CREDENTIAL_PROVIDER = "android.settings.CREDENTIAL_PROVIDER"; |