Snap for 8649577 from f6ea9c99b3 to tm-release

Change-Id: Ie81388b12900c15a3939899cc308f4c2d1fb27c5
This commit is contained in:
Android Build Coastguard Worker
2022-05-26 23:24:50 +00:00

View File

@@ -274,8 +274,12 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
String result = mSubsPrefCtrlInjector.getNetworkType( String result = mSubsPrefCtrlInjector.getNetworkType(
mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive); mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive);
if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isCarrierNetworkActive) { if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isCarrierNetworkActive) {
if (result.isEmpty()) {
result = mContext.getString(R.string.mobile_data_connection_active);
} else {
result = mContext.getString(R.string.preference_summary_default_combination, result = mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(R.string.mobile_data_connection_active), result); mContext.getString(R.string.mobile_data_connection_active), result);
}
} else if (!isDataInService) { } else if (!isDataInService) {
result = mContext.getString(R.string.mobile_data_no_connection); result = mContext.getString(R.string.mobile_data_no_connection);
} }