Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5274933 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342218



Change-Id: I34d588990a5357a05f636a583361a608b4b28976
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 511c72a8 9265db65

src/com/android/settings/network/telephony/Enable2gPreferenceController.java

+5 −4
Original line number Diff line number Diff line
@@ -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();

    }



    /**