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

Commit 606f1ae9 authored by fionaxu's avatar fionaxu Committed by android-build-merger
Browse files

Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am: 7f8d27f8 

am: 4aadda19

Change-Id: I5c01a75cbb65b8374548c18c5139f9d892e14f49
parents c47f92b3 4aadda19

core/java/android/content/Intent.java

+1 −12
Original line number Diff line number Diff line
@@ -1083,18 +1083,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @hide

     */

    public static final String ACTION_CALL_PRIVILEGED = "android.intent.action.CALL_PRIVILEGED";

    /**

     * Activity action: Activate the current SIM card.  If SIM cards do not require activation,

     * sending this intent is a no-op.

     * <p>Input: No data should be specified.  get*Extra may have an optional

     * {@link #EXTRA_SIM_ACTIVATION_RESPONSE} field containing a PendingIntent through which to

     * send the activation result.

     * <p>Output: nothing.

     * @hide

     */

    @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