commit 4e2e7bb734dd3d8822b6968c2bd05b9145959307
author Calvin Pan <calvinpan@google.com> Fri Apr 10 02:38:46 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 10 02:38:46 2020 +0000
tree 5f2f58f594c7d6e48a98afe71e87e157c22e24d0
parent 341a7971f0765aaeb3369bf7eb22e19ec444efda
parent a971c458badcdafa5db85cdfc35c3b2aa5215d9d

Merge "Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode" into rvc-dev

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

diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 948eeca..d2ff6e8 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -398,8 +398,13 @@
                     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 @@
                 mEntriesValue.add(value);
                 mIs5gEntryDisplayed = true;
             } else {
+                mIs5gEntryDisplayed = false;
                 Log.d(LOG_TAG, "Hide 5G option. "
                         + " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily
                         + " allowed5GNetworkType: " + mAllowed5gNetworkType