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

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

Merge "[MEP] Add subscriptionId as intent extra to a resolution intent."

parents 2f22b7f2 2f0319ed

core/api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -11143,6 +11143,7 @@ package android.service.euicc { 
    field public static final String EXTRA_RESOLUTION_CONFIRMATION_CODE_RETRIED = "android.service.euicc.extra.RESOLUTION_CONFIRMATION_CODE_RETRIED";

    field public static final String EXTRA_RESOLUTION_CONFIRMATION_CODE_RETRIED = "android.service.euicc.extra.RESOLUTION_CONFIRMATION_CODE_RETRIED";

    field public static final String EXTRA_RESOLUTION_CONSENT = "android.service.euicc.extra.RESOLUTION_CONSENT";

    field public static final String EXTRA_RESOLUTION_CONSENT = "android.service.euicc.extra.RESOLUTION_CONSENT";

    field public static final String EXTRA_RESOLUTION_PORT_INDEX = "android.service.euicc.extra.RESOLUTION_PORT_INDEX";

    field public static final String EXTRA_RESOLUTION_PORT_INDEX = "android.service.euicc.extra.RESOLUTION_PORT_INDEX";

    field public static final String EXTRA_RESOLUTION_SUBSCRIPTION_ID = "android.service.euicc.extra.RESOLUTION_SUBSCRIPTION_ID";

    field public static final String EXTRA_RESOLUTION_USE_PORT_INDEX = "android.service.euicc.extra.RESOLUTION_USE_PORT_INDEX";

    field public static final String EXTRA_RESOLUTION_USE_PORT_INDEX = "android.service.euicc.extra.RESOLUTION_USE_PORT_INDEX";

    field public static final String EXTRA_RESOLVABLE_ERRORS = "android.service.euicc.extra.RESOLVABLE_ERRORS";

    field public static final String EXTRA_RESOLVABLE_ERRORS = "android.service.euicc.extra.RESOLVABLE_ERRORS";

    field public static final int RESOLVABLE_ERROR_CONFIRMATION_CODE = 1; // 0x1

    field public static final int RESOLVABLE_ERROR_CONFIRMATION_CODE = 1; // 0x1

telephony/java/android/service/euicc/EuiccService.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -256,6 +256,13 @@ public abstract class EuiccService extends Service { 
    public static final String EXTRA_RESOLUTION_CARD_ID =

    public static final String EXTRA_RESOLUTION_CARD_ID =

            "android.service.euicc.extra.RESOLUTION_CARD_ID";

            "android.service.euicc.extra.RESOLUTION_CARD_ID";





    /**

     * Intent extra set for resolution requests containing an int indicating the subscription id

     * to be enabled.

     */

    public static final String EXTRA_RESOLUTION_SUBSCRIPTION_ID =

            "android.service.euicc.extra.RESOLUTION_SUBSCRIPTION_ID";



    /**

    /**

     * Intent extra set for resolution requests containing an int indicating the current port index.

     * Intent extra set for resolution requests containing an int indicating the current port index.

     */

     */