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
This commit is contained in:
calvinpan
2020-04-08 16:58:56 +08:00
parent cfbdcaf9f5
commit a971c458ba

View File

@@ -398,8 +398,13 @@ public class EnabledNetworkModePreferenceController extends
if (!mIsGlobalCdma) { if (!mIsGlobalCdma) {
setSelectedEntry( setSelectedEntry(
TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
setSummary( if (is5gEntryDisplayed()) {
mShow4gForLTE ? R.string.network_4G : R.string.network_lte); setSummary(mShow4gForLTE
? R.string.network_4G_pure : R.string.network_lte_pure);
} else {
setSummary(mShow4gForLTE
? R.string.network_4G : R.string.network_lte);
}
} else { } else {
setSelectedEntry( setSelectedEntry(
TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
@@ -542,6 +547,7 @@ public class EnabledNetworkModePreferenceController extends
mEntriesValue.add(value); mEntriesValue.add(value);
mIs5gEntryDisplayed = true; mIs5gEntryDisplayed = true;
} else { } else {
mIs5gEntryDisplayed = false;
Log.d(LOG_TAG, "Hide 5G option. " Log.d(LOG_TAG, "Hide 5G option. "
+ " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily + " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily
+ " allowed5GNetworkType: " + mAllowed5gNetworkType + " allowed5GNetworkType: " + mAllowed5gNetworkType