972bf437f6
During the early phase of work on DSDS, we found that a hacky solution to seeing duplicate subscriptions that are part of a logical group (eg Google Fi) was to filter out the entries with empty MNC strings. It turns out this breaks things for some legitimate eSIM subsctiptions, and isn't needed anymore because of the fixes that landed for b/127833821. Fixes: 130706446 Test: make RunSettingsRoboTests Change-Id: Ic4472c1de3c3e2449139b3e2ffb20d11a0058e8a
107 lines
4.1 KiB
Java
107 lines
4.1 KiB
Java
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.network;
|
|
|
|
import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT;
|
|
|
|
import static com.android.internal.util.CollectionUtils.emptyIfNull;
|
|
|
|
import android.content.Context;
|
|
import android.telephony.SubscriptionInfo;
|
|
import android.telephony.SubscriptionManager;
|
|
import android.telephony.TelephonyManager;
|
|
import android.telephony.UiccSlotInfo;
|
|
import android.text.TextUtils;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
|
|
public class SubscriptionUtil {
|
|
private static final String TAG = "SubscriptionUtil";
|
|
private static List<SubscriptionInfo> sAvailableResultsForTesting;
|
|
private static List<SubscriptionInfo> sActiveResultsForTesting;
|
|
|
|
@VisibleForTesting
|
|
public static void setAvailableSubscriptionsForTesting(List<SubscriptionInfo> results) {
|
|
sAvailableResultsForTesting = results;
|
|
}
|
|
|
|
@VisibleForTesting
|
|
public static void setActiveSubscriptionsForTesting(List<SubscriptionInfo> results) {
|
|
sActiveResultsForTesting = results;
|
|
}
|
|
|
|
public static List<SubscriptionInfo> getActiveSubscriptions(SubscriptionManager manager) {
|
|
if (sActiveResultsForTesting != null) {
|
|
return sActiveResultsForTesting;
|
|
}
|
|
final List<SubscriptionInfo> subscriptions = manager.getActiveSubscriptionInfoList(true);
|
|
if (subscriptions == null) {
|
|
return new ArrayList<>();
|
|
}
|
|
return subscriptions;
|
|
}
|
|
|
|
private static boolean isInactiveInsertedPSim(UiccSlotInfo slotInfo) {
|
|
return !slotInfo.getIsEuicc() && !slotInfo.getIsActive() &&
|
|
slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT;
|
|
}
|
|
|
|
public static List<SubscriptionInfo> getAvailableSubscriptions(Context context) {
|
|
if (sAvailableResultsForTesting != null) {
|
|
return sAvailableResultsForTesting;
|
|
}
|
|
final SubscriptionManager subMgr = context.getSystemService(SubscriptionManager.class);
|
|
final TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
|
|
|
|
List<SubscriptionInfo> subscriptions =
|
|
new ArrayList<>(emptyIfNull(subMgr.getSelectableSubscriptionInfoList()));
|
|
|
|
// Look for inactive but present physical SIMs that are missing from the selectable list.
|
|
final List<UiccSlotInfo> missing = new ArrayList<>();
|
|
UiccSlotInfo[] slotsInfo = telMgr.getUiccSlotsInfo();
|
|
for (int i = 0; slotsInfo != null && i < slotsInfo.length; i++) {
|
|
final UiccSlotInfo slotInfo = slotsInfo[i];
|
|
if (isInactiveInsertedPSim(slotInfo)) {
|
|
final int index = slotInfo.getLogicalSlotIdx();
|
|
final String cardId = slotInfo.getCardId();
|
|
|
|
final boolean found = subscriptions.stream().anyMatch(info ->
|
|
index == info.getSimSlotIndex() && cardId.equals(info.getCardString()));
|
|
if (!found) {
|
|
missing.add(slotInfo);
|
|
}
|
|
}
|
|
}
|
|
if (!missing.isEmpty()) {
|
|
for (SubscriptionInfo info : subMgr.getAllSubscriptionInfoList()) {
|
|
for (UiccSlotInfo slotInfo : missing) {
|
|
if (info.getSimSlotIndex() == slotInfo.getLogicalSlotIdx() &&
|
|
info.getCardString().equals(slotInfo.getCardId())) {
|
|
subscriptions.add(info);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return subscriptions;
|
|
}
|
|
}
|