PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8161ffae6bbe96c93dafa3328cb2fdad6614b4d9
This commit is contained in:
Bonian Chen
2020-08-05 07:12:12 +00:00
committed by Automerger Merge Worker
parent 05b07f424e 6afb84d6b2
commit 0f951e1b90
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -115,24 +115,7 @@ public class SubscriptionUtil {
return null; return null;
} }
if (subInfo.isEmbedded()) { return subInfo;
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;
} }
private static UiccSlotInfo [] getUiccSlotsInfo(Context context) { private static UiccSlotInfo [] getUiccSlotsInfo(Context context) {