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

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

Change-Id: I744e60682f381506ede505c087416c3ade021bac
This commit is contained in:
Zoey Chen
2021-09-02 13:57:57 +00:00
committed by Automerger Merge Worker

View File

@@ -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);