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

Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev

Browse Source
This commit is contained in:
SongFerng Wang
2023-08-10 04:53:18 +00:00
committed by Android (Google) Code Review
parent 9652e9c719 06a37cda0b
commit 9265db6557
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/network/telephony/Enable2gPreferenceController.java
View File

@@ -119,20 +119,21 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
String summary;
if (isDisabledByCarrier) {
summary = mContext.getString(R.string.enable_2g_summary_disabled_carrier,
getCarrierName());
getSimCardName());
} else {
summary = mContext.getString(R.string.enable_2g_summary);
}
preference.setSummary(summary);
}
private String getCarrierName() {
private String getSimCardName() {
SubscriptionInfo subInfo = SubscriptionUtil.getSubById(mSubscriptionManager, mSubId);
if (subInfo == null) {
return "";
}
CharSequence carrierName = subInfo.getCarrierName();
return TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
// It is the sim card name, and it should be the same name as the sim page.
CharSequence simCardName = subInfo.getDisplayName();
return TextUtils.isEmpty(simCardName) ? "" : simCardName.toString();
}
/**