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

SubscriptionsPreferenceController shows the unique sim description.

Browse Source 
Bug: 148303118
Bug: 150370656
Test: atest -c SubscriptionsPreferenceControllerTest
Change-Id: I041536fe0148087a068c6000383b382b0ff4e17c
This commit is contained in:
Jeremy Goldman
2021-01-15 16:32:07 +08:00
parent 8e2ecd5918
commit 9d87cd9126
33 changed files with 153 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -116,13 +116,14 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
return null;
} else if (subs.size() == 1) {
final SubscriptionInfo info = subs.get(0);
final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
info, mContext);
final int subId = info.getSubscriptionId();
if (!info.isEmbedded() && !mSubscriptionManager.isActiveSubscriptionId(subId)
&& !SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)) {
return mContext.getString(R.string.mobile_network_tap_to_activate,
SubscriptionUtil.getDisplayName(info));
return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
} else {
return subs.get(0).getDisplayName();
return displayName;
}
} else {
if (com.android.settings.Utils.isProviderModelEnabled(mContext)) {
@@ -135,8 +136,9 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
}
private CharSequence getSummaryForProviderModel(List<SubscriptionInfo> subs) {
return String.join(", ", subs.stream().map(SubscriptionInfo::getDisplayName)
.collect(Collectors.toList()));
return String.join(", ", subs.stream().map(subInfo -> {
return SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, mContext);
}).collect(Collectors.toList()));
}
private void startAddSimFlow() {