From affe5406a6d49f028ac95ad228658ec39f12132c Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Thu, 16 Jan 2020 18:21:01 +0800 Subject: [PATCH] Mainline: removed legacy UI for network selection mode. This cl base on ag/10098777. Now inserted inactive pSIM will be included in Telephony's get available and get selectable subInfo list so that logic is no longer needed. Bug: 147128878 Test: build pass Change-Id: I1a0f431f05268d29afce145c3eb720594cfc57a3 --- .../settings/network/SubscriptionUtil.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java index bcb4895c0c9..41c7c1411a5 100644 --- a/src/com/android/settings/network/SubscriptionUtil.java +++ b/src/com/android/settings/network/SubscriptionUtil.java @@ -115,24 +115,7 @@ public class SubscriptionUtil { return null; } - if (subInfo.isEmbedded()) { - return subInfo; - } - - // Look for physical SIM which presented in slots no mater active or not. - final UiccSlotInfo[] slotsInfo = getUiccSlotsInfo(context); - if (slotsInfo == null) { - return null; - } - for (UiccSlotInfo slotInfo : slotsInfo) { - if ((!slotInfo.getIsEuicc()) - && (slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT) - && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex()) - && TextUtils.equals(slotInfo.getCardId(), subInfo.getCardString())) { - return subInfo; - } - } - return null; + return subInfo; } private static UiccSlotInfo [] getUiccSlotsInfo(Context context) {