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

Commit 0758056d authored by Calvin Pan's avatar Calvin Pan Committed by Android (Google) Code Review
Browse files

Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev

parents 82282b48 37812984

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

+20 −2
Original line number Diff line number Diff line
@@ -474,10 +474,28 @@ public class EnabledNetworkModePreferenceController extends 
                        }

                    }

                    break;

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:



                case TelephonyManagerConstants.NETWORK_MODE_NR_ONLY:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:

                    setSelectedEntry(

                            TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);

                    setSummary(mContext.getString(R.string.network_5G)

                            + mContext.getString(R.string.network_recommended));

                    break;

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:

                    setSelectedEntry(networkMode);

                    setSelectedEntry(

                        TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);

                    setSummary(mContext.getString(R.string.network_5G)

                            + mContext.getString(R.string.network_recommended));

                    break;

                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:

                    setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO);

                    setSummary(mContext.getString(R.string.network_5G)

                            + mContext.getString(R.string.network_recommended));

                    break;