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

6
src/com/android/settings/sim/SimActivationNotifier.java
View File

@@ -117,10 +117,12 @@ public class SimActivationNotifier {
return;
}
CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
activeRemovableSub, mContext);
String carrierName =
TextUtils.isEmpty(activeRemovableSub.getDisplayName())
TextUtils.isEmpty(displayName)
? mContext.getString(R.string.sim_card_label)
: activeRemovableSub.getDisplayName().toString();
: displayName.toString();
String title =
mContext.getString(
R.string.post_dsds_reboot_notification_title_with_carrier, carrierName);