Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59996190 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix for incorrect display of preferred network type on UI" am: bb25d484 

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

Change-Id: I51e37f71b93af68a88c989b29a0230d3c771e26b
parents df73f7e0 bb25d484

src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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: