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

Merge "Fix wrong summary string show on the network page." into tm-dev

Browse Source
This commit is contained in:
Tom Hsu
2022-05-26 15:06:00 +00:00
committed by Android (Google) Code Review
parent b91e43c526 d793e9512d
commit f6ea9c99b3
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);
}