commit fbcff0c32d6718410c895247d63ae2d04e075640
author Muralidhar Reddy <muralidharm@google.com> Wed Jan 19 13:07:57 2022 +0000
committer Muralidhar Reddy Mule <muralidharm@google.com> Thu Jan 20 06:07:36 2022 +0000
tree c3b4052a1e6e2301f01f10adaebdb4b17d80077e
parent b5f6ab7c4b0ef9dbec2352e94d3226874fc03a25

[MEP] eSim profile is not enabled

eSim profile is not getting enabled when tried from the Settings->SIMs->Downloaded Sim. Modified logic to directly rely on PortIdxToPhoneId mapping in UiccSlot, this is to fix the getSimSlotMapping return wrong value in DSDS mode when psim card is absent.

Bug: 213251124
Test: Manual, atest TeleServiceTests
Change-Id: Ib85bedac840fe46b8f295e57811af2399abd5092

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8f48501..e1a7cbc 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9057,13 +9057,8 @@
                 for (int portIdx : portIndexes) {
                     String iccId = IccUtils.stripTrailingFs(getIccId(slot, portIdx,
                             callingPackage, hasReadPermission));
-                    if (slot.isPortActive(portIdx)) {
-                        UiccPort port = slot.getUiccCard().getUiccPort(portIdx);
-                        portInfos.add(new UiccPortInfo(iccId, port.getPortIdx(),
-                                port.getPhoneId(), true));
-                    } else {
-                        portInfos.add(new UiccPortInfo(iccId, portIdx, -1, false));
-                    }
+                    portInfos.add(new UiccPortInfo(iccId, portIdx,
+                            slot.getPhoneIdFromPortIndex(portIdx), slot.isPortActive(portIdx)));
                 }
                 infos[i] = new UiccSlotInfo(
                         slot.isEuicc(),