From 7d71d3f4518ac636500a52980b773ad2a0eba1b7 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Fri, 27 May 2022 16:40:31 +0800 Subject: [PATCH] [MEP] The removale slot can read the esim card Revert the wrong logic for removale slot part at ag/18579901, the removable slot can read the esim card. Bug: 233338345 Test: atest UiccSlotUtilTest Change-Id: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 Merged-In: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 --- src/com/android/settings/network/EnableMultiSimSidecar.java | 3 +-- src/com/android/settings/network/UiccSlotUtil.java | 1 - .../network/telephony/ToggleSubscriptionDialogActivity.java | 1 - .../android/settings/sim/receivers/SimSlotChangeHandler.java | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/network/EnableMultiSimSidecar.java b/src/com/android/settings/network/EnableMultiSimSidecar.java index 5545a69dd21..aefd55f00e8 100644 --- a/src/com/android/settings/network/EnableMultiSimSidecar.java +++ b/src/com/android/settings/network/EnableMultiSimSidecar.java @@ -190,8 +190,7 @@ public class EnableMultiSimSidecar extends AsyncTaskSidecar { Set activeRemovableLogicalSlotIds = new ArraySet<>(); for (UiccSlotInfo info : infos) { for (UiccPortInfo portInfo :info.getPorts()) { - if (info != null && portInfo.isActive() && info.isRemovable() - && !info.getIsEuicc()) { + if (info != null && portInfo.isActive() && info.isRemovable()) { activeRemovableLogicalSlotIds.add(portInfo.getLogicalSlotIndex()); } } diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java index 2a08c1c3476..c27621a06dd 100644 --- a/src/com/android/settings/network/UiccSlotUtil.java +++ b/src/com/android/settings/network/UiccSlotUtil.java @@ -249,7 +249,6 @@ public class UiccSlotUtil { if (slotId == INVALID_PHYSICAL_SLOT_ID) { for (int i = 0; i < slots.length; i++) { if (slots[i].isRemovable() - && !slots[i].getIsEuicc() && !slots[i].getPorts().stream().findFirst().get().isActive() && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) { diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java index 2a902e5785a..cc2986d5344 100644 --- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java +++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java @@ -589,7 +589,6 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc .anyMatch( slot -> slot != null && slot.isRemovable() - && !slot.getIsEuicc() && slot.getPorts().stream().anyMatch( port -> port.isActive()) && slot.getCardStateInfo() diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java index da3db8b1369..4a6b96c1fa3 100644 --- a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java +++ b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java @@ -294,7 +294,7 @@ public class SimSlotChangeHandler { return null; } for (UiccSlotInfo slotInfo : slotInfos) { - if (slotInfo != null && slotInfo.isRemovable() && !slotInfo.getIsEuicc()) { + if (slotInfo != null && slotInfo.isRemovable()) { return slotInfo; } }