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 Merged-In: I1a0f431f05268d29afce145c3eb720594cfc57a3 Change-Id: I54ed8c69edcdc618f8cf8df8af0fffc8c4f187e8
This commit is contained in:
committed by
Bonian Chen
parent
144e2b41f5
commit
7e045ab9f6
@@ -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) {
|
||||
|
Reference in New Issue
Block a user