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

Commit da56f08b authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun
Browse files

Populate cardId in resolution intent. 

When LPA resolves a resolvable error, it needs to get an instance of
EuiccManager. Since we add cardId in EuiccManager from Q, we also need
to populate the cardId in the resolution intent so that when LPA solves
the resolvable errors, it uses the EuiccManage with the same cardId as
before.

Bug: 68941776
Test: test on phone
Change-Id: I780c39856c36516dbf1546eff28348a83d0a4fc9
parent e3ecbde6

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5639,6 +5639,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 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_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_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";

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

+6 −0
Original line number Diff line number Diff line
@@ -184,6 +184,12 @@ public abstract class EuiccService extends Service { 
    public static final String 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 */

    @Retention(RetentionPolicy.SOURCE)

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