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

Commit 75176376 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

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

Change-Id: I3eb9b1b2ce9046f23c055fcba6f93f937b739212
parents a42a8d6b 18062f81
Loading
Loading
Loading
Loading
+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);