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

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387134

Change-Id: I8161ffae6bbe96c93dafa3328cb2fdad6614b4d9

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) {