Merge "Mainline: removed legacy UI for network selection mode."
This commit is contained in:
committed by
Android (Google) Code Review
commit
5f4fadb949
@@ -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) {
|
||||||
|
Reference in New Issue
Block a user