Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 567d3ebd authored by Becca Hughes's avatar Becca Hughes Committed by Android (Google) Code Review
Browse files

Merge "Flag new Credential Manager settings intent" into main

parents c82b6e66 8ca2aaf2

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -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";