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

Commit 2b9f09ba authored by Jiuyu Sun's avatar Jiuyu Sun Committed by Android (Google) Code Review
Browse files

Merge "Populate cardId in resolution intent."

parents 61d7333f da56f08b

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -5746,6 +5746,7 @@ package android.service.euicc { 
    field public static final java.lang.String EUICC_SERVICE_INTERFACE = "android.service.euicc.EuiccService";

    field public static final java.lang.String EUICC_SERVICE_INTERFACE = "android.service.euicc.EuiccService";

    field public static final java.lang.String EXTRA_RESOLUTION_ALLOW_POLICY_RULES = "android.service.euicc.extra.RESOLUTION_ALLOW_POLICY_RULES";

    field public static final java.lang.String EXTRA_RESOLUTION_ALLOW_POLICY_RULES = "android.service.euicc.extra.RESOLUTION_ALLOW_POLICY_RULES";

    field public static final java.lang.String EXTRA_RESOLUTION_CALLING_PACKAGE = "android.service.euicc.extra.RESOLUTION_CALLING_PACKAGE";

    field public static final java.lang.String EXTRA_RESOLUTION_CALLING_PACKAGE = "android.service.euicc.extra.RESOLUTION_CALLING_PACKAGE";

    field public static final java.lang.String EXTRA_RESOLUTION_CARD_ID = "android.service.euicc.extra.RESOLUTION_CARD_ID";

    field public static final java.lang.String EXTRA_RESOLUTION_CONFIRMATION_CODE = "android.service.euicc.extra.RESOLUTION_CONFIRMATION_CODE";

    field public static final java.lang.String EXTRA_RESOLUTION_CONFIRMATION_CODE = "android.service.euicc.extra.RESOLUTION_CONFIRMATION_CODE";

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

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

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

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

core/java/android/service/euicc/EuiccService.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,12 @@ public abstract class EuiccService extends Service { 
    public static final String EXTRA_RESOLUTION_CONFIRMATION_CODE_RETRIED =

    public static final String EXTRA_RESOLUTION_CONFIRMATION_CODE_RETRIED =

            "android.service.euicc.extra.RESOLUTION_CONFIRMATION_CODE_RETRIED";

            "android.service.euicc.extra.RESOLUTION_CONFIRMATION_CODE_RETRIED";





    /**

     * Intent extra set for resolution requests containing an int indicating the current card Id.

     */

    public static final String EXTRA_RESOLUTION_CARD_ID =

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



    /** @hide */

    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = { "RESULT_" }, value = {

    @IntDef(prefix = { "RESULT_" }, value = {