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

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

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

View File

@@ -486,8 +486,7 @@ public class InternetDialog extends SystemUIDialog implements
} }
private void showTurnOffMobileDialog() { private void showTurnOffMobileDialog() {
CharSequence carrierName = CharSequence carrierName = getMobileNetworkTitle();
mSubscriptionManager.getDefaultDataSubscriptionInfo().getCarrierName();
boolean isInService = mInternetDialogController.isVoiceStateInService(); boolean isInService = mInternetDialogController.isVoiceStateInService();
if (TextUtils.isEmpty(carrierName) || !isInService) { if (TextUtils.isEmpty(carrierName) || !isInService) {
carrierName = mContext.getString(R.string.mobile_data_disable_message_default_carrier); carrierName = mContext.getString(R.string.mobile_data_disable_message_default_carrier);