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

Commit a971c458 authored by calvinpan's avatar calvinpan
Browse files

Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode 

Add is5gEntryDisplayed() check in in NETWORK_MODE_LTE_GSM_WCDMA mode to
prevent that show "LTE(recommand)" everytime.

Bug: 153301072
Test: By manual
1. Reproduce issue
2. Verify the patch

Change-Id: I96311a1e399efd160a3f7290f85df778b2d6f0c4
parent cfbdcaf9

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

+8 −2
Original line number Diff line number Diff line
@@ -398,8 +398,13 @@ public class EnabledNetworkModePreferenceController extends 
                    if (!mIsGlobalCdma) {

                        setSelectedEntry(

                                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);

                        setSummary(

                                mShow4gForLTE ? R.string.network_4G : R.string.network_lte);

                        if (is5gEntryDisplayed()) {

                            setSummary(mShow4gForLTE

                                ? R.string.network_4G_pure : R.string.network_lte_pure);

                        } else {

                            setSummary(mShow4gForLTE

                                ? R.string.network_4G : R.string.network_lte);

                        }

                    } else {

                        setSelectedEntry(

                                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
@@ -542,6 +547,7 @@ public class EnabledNetworkModePreferenceController extends 
                mEntriesValue.add(value);

                mIs5gEntryDisplayed = true;

            } else {

                mIs5gEntryDisplayed = false;

                Log.d(LOG_TAG, "Hide 5G option. "

                        + " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily

                        + " allowed5GNetworkType: " + mAllowed5gNetworkType