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

Commit f4e466d2 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:... 

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

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

Change-Id: Icfb3a897844380990971bab39e19ef1d137e2b53
parents 1555c9b8 14d4ca3c

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

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