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

Commit 885b3ef5 authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge "New generic intent for SIM Activation"

parents bb664e12 15a13781

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ package android { 
    field public static final java.lang.String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";

    field public static final java.lang.String PACKAGE_VERIFICATION_AGENT = "android.permission.PACKAGE_VERIFICATION_AGENT";

    field public static final java.lang.String PERFORM_CDMA_PROVISIONING = "android.permission.PERFORM_CDMA_PROVISIONING";

    field public static final java.lang.String PERFORM_SIM_ACTIVATION = "android.permission.PERFORM_SIM_ACTIVATION";

    field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";

    field public static final java.lang.String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";

    field public static final java.lang.String PROVIDE_TRUST_AGENT = "android.permission.PROVIDE_TRUST_AGENT";

core/java/android/content/Intent.java

+21 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,18 @@ 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: Send a message to someone specified by the data.

     * <p>Input: {@link #getData} is URI describing the target.
@@ -3620,6 +3632,15 @@ public class Intent implements Parcelable, Cloneable { 
    /** {@hide} */

    public static final String EXTRA_REASON = "android.intent.extra.REASON";



    /**

     * Optional {@link android.app.PendingIntent} extra used to deliver the result of the SIM

     * activation request.

     * TODO: Add information about the structure and response data used with the pending intent.

     * @hide

     */

    public static final String EXTRA_SIM_ACTIVATION_RESPONSE =

            "android.intent.extra.SIM_ACTIVATION_RESPONSE";



    // ---------------------------------------------------------------------

    // ---------------------------------------------------------------------

    // Intent flags (see mFlags variable).

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -2601,6 +2601,12 @@ 
        android:description="@string/permdesc_performCdmaProvisioning"

        android:protectionLevel="signature|system" />



    <!-- @SystemApi Allows an application to perform SIM Activation @hide -->

    <permission android:name="android.permission.PERFORM_SIM_ACTIVATION"

        android:label="@string/permlab_performSimActivation"

        android:description="@string/permdesc_performSimActivation"

        android:protectionLevel="signature|system" />



    <!-- @SystemApi Allows enabling/disabling location update notifications from

         the radio.

         <p>Not for use by third-party applications. -->

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1889,6 +1889,10 @@ 
    <string name="permdesc_performCdmaProvisioning">Allows the app to start CDMA provisioning.

        Malicious apps may unnecessarily start CDMA provisioning.</string>



    <string name="permlab_performSimActivation">start SIM card setup</string>

    <string name="permdesc_performSimActivation">Allows the app to handle SIM activation requests.

        The app may directly perform activation or may delegate to another app.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_locationUpdates">control location update notifications</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->