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

Commit c96387d3 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Added an intent action key for carrier satellite service" into main

parents d744de95 e4b30ff1

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -36623,6 +36623,7 @@ package android.provider { 
    field @FlaggedApi("com.android.media.flags.enable_privileged_routing_for_media_routing_control") public static final String ACTION_REQUEST_MEDIA_ROUTING_CONTROL = "android.settings.REQUEST_MEDIA_ROUTING_CONTROL";

    field @FlaggedApi("com.android.media.flags.enable_privileged_routing_for_media_routing_control") public static final String ACTION_REQUEST_MEDIA_ROUTING_CONTROL = "android.settings.REQUEST_MEDIA_ROUTING_CONTROL";

    field public static final String ACTION_REQUEST_SCHEDULE_EXACT_ALARM = "android.settings.REQUEST_SCHEDULE_EXACT_ALARM";

    field public static final String ACTION_REQUEST_SCHEDULE_EXACT_ALARM = "android.settings.REQUEST_SCHEDULE_EXACT_ALARM";

    field public static final String ACTION_REQUEST_SET_AUTOFILL_SERVICE = "android.settings.REQUEST_SET_AUTOFILL_SERVICE";

    field public static final String ACTION_REQUEST_SET_AUTOFILL_SERVICE = "android.settings.REQUEST_SET_AUTOFILL_SERVICE";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String ACTION_SATELLITE_SETTING = "android.settings.SATELLITE_SETTING";

    field public static final String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";

    field public static final String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";

    field public static final String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";

    field public static final String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";

    field public static final String ACTION_SETTINGS = "android.settings.SETTINGS";

    field public static final String ACTION_SETTINGS = "android.settings.SETTINGS";

core/java/android/provider/Settings.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,20 @@ public final class Settings { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_SETTINGS = "android.settings.SETTINGS";

    public static final String ACTION_SETTINGS = "android.settings.SETTINGS";




















    /**














     * Activity Action: Show settings to provide guide about carrier satellite messaging.














     * <p>














     * In some cases, a matching Activity may not exist, so ensure you














     * safeguard against this.














     * <p>














     * Input: Nothing.














     * <p>














     * Output: Nothing.














     */














    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)














    @FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)














    public static final String ACTION_SATELLITE_SETTING = "android.settings.SATELLITE_SETTING";
























    /**







    /**











     * Activity Action: Show settings to allow configuration of APNs.







     * Activity Action: Show settings to allow configuration of APNs.











     * <p>







     * <p>