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 am: f6ea9c99b3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2022-05-26 15:41:44 +00:00
committed by Automerger Merge Worker
parent 6096b86e1a f6ea9c99b3
commit 806582197e
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( String result = mSubsPrefCtrlInjector.getNetworkType(
mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive); mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive);
if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isCarrierNetworkActive) { if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isCarrierNetworkActive) {
result = mContext.getString(R.string.preference_summary_default_combination, if (result.isEmpty()) {
mContext.getString(R.string.mobile_data_connection_active), result); 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) { } else if (!isDataInService) {
result = mContext.getString(R.string.mobile_data_no_connection); result = mContext.getString(R.string.mobile_data_no_connection);
} }