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"

Browse Source
This commit is contained in:
SongFerng Wang
2020-09-23 08:49:19 +00:00
committed by Gerrit Code Review
parent 18e1a7c047 5f5f75cb3d
commit bb25d4841c
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 if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
|| mIsGlobalCdma || mIsGlobalCdma
|| MobileNetworkUtils.isWorldMode(mContext, mSubId)) { || 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 { } else {
return R.string.preferred_network_mode_lte_summary; 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: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
return R.string.preferred_network_mode_nr_lte_gsm_wcdma_summary; return R.string.preferred_network_mode_nr_lte_gsm_wcdma_summary;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA: 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: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
return R.string.preferred_network_mode_nr_lte_wcdma_summary; return R.string.preferred_network_mode_nr_lte_wcdma_summary;
case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA: