PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode" into rvc-dev am: 4e2e7bb734 am: 2b6e636673 am: ff3b20f5eb am: 04b6333a8f am: 6168c27d8e

Browse Source 
Change-Id: Ifd72267e08064a0284e051958ac86a5e35451629
This commit is contained in:
Calvin Pan
2020-04-10 04:45:37 +00:00
committed by Automerger Merge Worker
parent dea5b04520 6168c27d8e
commit 3c992cdad6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -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