PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 8649577 from f6ea9c99b3 to tm-release

Browse Source 
Change-Id: Ie81388b12900c15a3939899cc308f4c2d1fb27c5
This commit is contained in:
Android Build Coastguard Worker
2022-05-26 23:24:50 +00:00
parent ffc0d3effb f6ea9c99b3
commit d6a833f78c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

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