From 06a37cda0b12dea92698277f3ff3866ed0a34da7 Mon Sep 17 00:00:00 2001 From: SongFerng Wang Date: Tue, 8 Aug 2023 08:30:27 +0000 Subject: [PATCH] The 2G enable's summary shows the sim card name The 2G enable's summary should show the sim card name, not the name of service provider. Bug: 293715485 Test: build pass Change-Id: Iead9c4e82cd4bf26451e38ded7cbcd276e9fa5f2 --- .../network/telephony/Enable2gPreferenceController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java index 106aa0238c7..03f3be4f359 100644 --- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java +++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java @@ -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(); } /**