From da56f08b94f366b7e549e6ee4106b604d4f4bf1c Mon Sep 17 00:00:00 2001 From: Holly Jiuyu Sun Date: Thu, 17 Jan 2019 17:09:09 -0800 Subject: [PATCH] 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 --- api/system-current.txt | 1 + core/java/android/service/euicc/EuiccService.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index 7ea7afbb8d20a..99c5c35128e6c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; diff --git a/core/java/android/service/euicc/EuiccService.java b/core/java/android/service/euicc/EuiccService.java index 4be1f9cd6ae50..4dc10cd2e4cc3 100644 --- a/core/java/android/service/euicc/EuiccService.java +++ b/core/java/android/service/euicc/EuiccService.java @@ -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 = {