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

Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c am: 59996190cc am: 14d4ca3cc0 am: f4e466d20c

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

Change-Id: I12a4d0f18bbffd891e46d3e6bef880cbe74eee34
This commit is contained in:
SongFerng Wang
2020-09-23 11:02:25 +00:00
committed by Automerger Merge Worker
parent a740b65932 f4e466d20c
commit e149bf93b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
View File

@@ -153,7 +153,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
|| mIsGlobalCdma
|| MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
return R.string.preferred_network_mode_global_summary;
return R.string.preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary;
} else {
return R.string.preferred_network_mode_lte_summary;
}
@@ -174,7 +174,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
return R.string.preferred_network_mode_nr_lte_gsm_wcdma_summary;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
return R.string.preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary;
return R.string.preferred_network_mode_global_summary;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
return R.string.preferred_network_mode_nr_lte_wcdma_summary;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA: