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

Use ArrayMap to cache active subscriptions

Browse Source 
Because we use ArrayMap to deduplicate active subscriptions.
Caching also needs to use ArrayMap, otherwise it will cause
index inconsistency.

Bug: 295124402

Change-Id: I4fa0efd1d35855d0ea7723ad6134213ab384cd4d
Signed-off-by: DingFei Song <v-dingfeisong@xiaomi.corp-partner.google.com>
This commit is contained in:
DingFei Song
2023-08-11 10:47:48 +08:00
parent 137235a27f
commit 07f2e22d26
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -223,7 +223,7 @@ public class WifiConfigController2 implements TextWatcher,
private final WifiManager mWifiManager; private final WifiManager mWifiManager;
private boolean mIsTrustOnFirstUseSupported; private boolean mIsTrustOnFirstUseSupported;
private final List<SubscriptionInfo> mActiveSubscriptionInfos = new ArrayList<>(); private final ArrayMap<Integer, SubscriptionInfo> mActiveSubscriptionInfos = new ArrayMap<>();
public WifiConfigController2(WifiConfigUiBase2 parent, View view, WifiEntry wifiEntry, public WifiConfigController2(WifiConfigUiBase2 parent, View view, WifiEntry wifiEntry,
int mode) { int mode) {
@@ -703,7 +703,7 @@ public class WifiConfigController2 implements TextWatcher,
if (config.enterpriseConfig.isAuthenticationSimBased() if (config.enterpriseConfig.isAuthenticationSimBased()
&& mActiveSubscriptionInfos.size() > 0) { && mActiveSubscriptionInfos.size() > 0) {
config.carrierId = mActiveSubscriptionInfos config.carrierId = mActiveSubscriptionInfos
.get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId(); .valueAt(mEapSimSpinner.getSelectedItemPosition()).getCarrierId();
} }
String caCert = (String) mEapCaCertSpinner.getSelectedItem(); String caCert = (String) mEapCaCertSpinner.getSelectedItem();
@@ -1114,11 +1114,9 @@ public class WifiConfigController2 implements TextWatcher,
} }
if (enterpriseConfig.isAuthenticationSimBased()) { if (enterpriseConfig.isAuthenticationSimBased()) {
for (int i = 0; i < mActiveSubscriptionInfos.size(); i++) { int index = mActiveSubscriptionInfos.indexOfKey(wifiConfig.carrierId);
if (wifiConfig.carrierId == mActiveSubscriptionInfos.get(i).getCarrierId()) { if (index > -1) {
mEapSimSpinner.setSelection(i); mEapSimSpinner.setSelection(index);
break;
}
} }
} }
@@ -1476,18 +1474,8 @@ public class WifiConfigController2 implements TextWatcher,
} }
mActiveSubscriptionInfos.clear(); mActiveSubscriptionInfos.clear();
// De-duplicates active subscriptions and caches in mActiveSubscriptionInfos.
for (SubscriptionInfo newInfo : activeSubscriptionInfos) {
for (SubscriptionInfo cachedInfo : mActiveSubscriptionInfos) {
if (newInfo.getCarrierId() == cachedInfo.getCarrierId()) {
continue;
}
}
mActiveSubscriptionInfos.add(newInfo);
}
// Shows disabled 'No SIM' when there is no active subscription. // Shows disabled 'No SIM' when there is no active subscription.
if (mActiveSubscriptionInfos.size() == 0) { if (activeSubscriptionInfos.isEmpty()) {
final String[] noSim = new String[]{mContext.getString(R.string.wifi_no_sim_card)}; final String[] noSim = new String[]{mContext.getString(R.string.wifi_no_sim_card)};
mEapSimSpinner.setAdapter(getSpinnerAdapter(noSim)); mEapSimSpinner.setAdapter(getSpinnerAdapter(noSim));
mEapSimSpinner.setSelection(0 /* position */); mEapSimSpinner.setSelection(0 /* position */);
@@ -1498,7 +1486,7 @@ public class WifiConfigController2 implements TextWatcher,
// Shows display name of each active subscription. // Shows display name of each active subscription.
ArrayMap<Integer, CharSequence> displayNames = new ArrayMap<>(); ArrayMap<Integer, CharSequence> displayNames = new ArrayMap<>();
int defaultDataSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId(); int defaultDataSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
for (SubscriptionInfo activeSubInfo : mActiveSubscriptionInfos) { for (SubscriptionInfo activeSubInfo : activeSubscriptionInfos) {
// If multiple SIMs have the same carrier id, only the first or default data SIM is // If multiple SIMs have the same carrier id, only the first or default data SIM is
// displayed. // displayed.
if (displayNames.containsKey(activeSubInfo.getCarrierId()) if (displayNames.containsKey(activeSubInfo.getCarrierId())
@@ -1507,6 +1495,7 @@ public class WifiConfigController2 implements TextWatcher,
} }
displayNames.put(activeSubInfo.getCarrierId(), displayNames.put(activeSubInfo.getCarrierId(),
SubscriptionUtil.getUniqueSubscriptionDisplayName(activeSubInfo, mContext)); SubscriptionUtil.getUniqueSubscriptionDisplayName(activeSubInfo, mContext));
mActiveSubscriptionInfos.put(activeSubInfo.getCarrierId(), activeSubInfo);
} }
mEapSimSpinner.setAdapter( mEapSimSpinner.setAdapter(
getSpinnerAdapter(displayNames.values().toArray(new String[displayNames.size()]))); getSpinnerAdapter(displayNames.values().toArray(new String[displayNames.size()])));