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

Commit e77f1b19 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] The carrier name of the "Turn off mobile data" is... 

Merge "[Provider Model] The carrier name of the "Turn off mobile data" is wrong." into sc-qpr1-dev am: 18062f81 am: db7a0032

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15741644

Change-Id: I92c758cb48e525ae42cf06cbb95f85ef58b357ec
parents c5c07300 db7a0032

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+1 −2
Original line number Diff line number Diff line
@@ -486,8 +486,7 @@ public class InternetDialog extends SystemUIDialog implements 
    }



    private void showTurnOffMobileDialog() {

        CharSequence carrierName =

                mSubscriptionManager.getDefaultDataSubscriptionInfo().getCarrierName();

        CharSequence carrierName = getMobileNetworkTitle();

        boolean isInService = mInternetDialogController.isVoiceStateInService();

        if (TextUtils.isEmpty(carrierName) || !isInService) {

            carrierName = mContext.getString(R.string.mobile_data_disable_message_default_carrier);