commit 5f4fadb949448cd848e8520067125693b59cbe4c
author SongFerng Wang <songferngwang@google.com> Thu Jan 16 14:27:25 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 16 14:27:25 2020 +0000
tree 3e984d89acb1a68c1a3176c8a3eabcf2c460d179
parent bc6bd7422890dce9e0edb2c2f1aea1b341721bcb
parent affe5406a6d49f028ac95ad228658ec39f12132c

Merge "Mainline: removed legacy UI for network selection mode."

src/com/android/settings/network/SubscriptionUtil.java

diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index bcb4895..41c7c14 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -115,24 +115,7 @@
             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) {