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

Commit f73da9c7 authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "move ACTION_CARRIER_SETUP intent to public api"

parents 38a65f6c adfe7009

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9041,6 +9041,7 @@ package android.content { 
    field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL";

    field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON";

    field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON";

    field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP";

    field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER";

    field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE";

    field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9515,6 +9515,7 @@ package android.content { 
    field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL";

    field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON";

    field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON";

    field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP";

    field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER";

    field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE";

    field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9070,6 +9070,7 @@ package android.content { 
    field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL";

    field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON";

    field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON";

    field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP";

    field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER";

    field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE";

    field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS";

core/java/android/content/Intent.java

+9 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,15 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_SIM_ACTIVATION_REQUEST =

            "android.intent.action.SIM_ACTIVATION_REQUEST";

    /**

     * Activity Action: Main entry point for carrier setup apps.

     * <p>Carrier apps that provide an implementation for this action may be invoked to configure

     * carrier service and typically require

     * {@link android.telephony.TelephonyManager#hasCarrierPrivileges() carrier privileges} to

     * fulfill their duties.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP";

    /**

     * Activity Action: Send a message to someone specified by the data.

     * <p>Input: {@link #getData} is URI describing the target.

telephony/java/com/android/internal/telephony/TelephonyIntents.java

+0 −9
Original line number Diff line number Diff line
@@ -263,15 +263,6 @@ public class TelephonyIntents { 
    public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS

            = "android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS";



    /**

     * Activity Action: Start this activity to invoke the carrier setup app.

     * The carrier app must be signed using a certificate that matches the UICC access rules.

     *

     * <p class="note">Callers of this should hold the android.permission.INVOKE_CARRIER_SETUP

     * permission.</p>

     */

    public static final String ACTION_CARRIER_SETUP = "android.intent.action.ACTION_CARRIER_SETUP";



    /**

     * <p>Broadcast Action: Indicates that the action is forbidden by network.

     * <p class="note">