From a971c458badcdafa5db85cdfc35c3b2aa5215d9d Mon Sep 17 00:00:00 2001
From: calvinpan <calvinpan@google.com>
Date: Wed, 8 Apr 2020 16:58:56 +0800
Subject: [PATCH] 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
---
 .../EnabledNetworkModePreferenceController.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 948eecaa5c2..d2ff6e8e4ae 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -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