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

Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf am: 4967e754eb am: f6e91b15da

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

Change-Id: Idd403862e3246f54819ad23e66ec2dc64ae99024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-08-10 18:16:29 +00:00
committed by Automerger Merge Worker
parent 8498c4f3d4 f6e91b15da
commit 4cfe8b60be
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -713,22 +713,29 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
.getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList(); .getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList();
final int defaultDataSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId(); final int defaultDataSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
if (activeSubscriptionInfos != null) { if (activeSubscriptionInfos != null) {
CharSequence firstCarrierIdMatchedDisplayName = null;
for (SubscriptionInfo subscriptionInfo : activeSubscriptionInfos) { for (SubscriptionInfo subscriptionInfo : activeSubscriptionInfos) {
final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName( final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
subscriptionInfo, mContext); subscriptionInfo, mContext);
if (config.carrierId == subscriptionInfo.getCarrierId()) { if (firstCarrierIdMatchedDisplayName == null
mEapSimSubscriptionPref.setSummary(displayName); && config.carrierId == subscriptionInfo.getCarrierId()) {
return; firstCarrierIdMatchedDisplayName = displayName;
} }
// When it's UNKNOWN_CARRIER_ID, devices connects it with the SIM subscription of // When it's UNKNOWN_CARRIER_ID or matched with configured CarrierId,
// defaultDataSubscriptionId. // devices connects it with the SIM subscription of defaultDataSubscriptionId.
if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID if (defaultDataSubscriptionId == subscriptionInfo.getSubscriptionId()
&& defaultDataSubscriptionId == subscriptionInfo.getSubscriptionId()) { && (config.carrierId == subscriptionInfo.getCarrierId()
|| config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID)) {
mEapSimSubscriptionPref.setSummary(displayName); mEapSimSubscriptionPref.setSummary(displayName);
return; return;
} }
} }
if (firstCarrierIdMatchedDisplayName != null) {
mEapSimSubscriptionPref.setSummary(firstCarrierIdMatchedDisplayName);
return;
}
} }
if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) { if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) {