diff options
| author | SongFerngWang <songferngwang@google.com> | 2020-05-28 20:37:51 +0800 |
|---|---|---|
| committer | SongFerngWang <songferngwang@google.com> | 2020-05-28 20:37:51 +0800 |
| commit | 259e6288c9f91f8144c12127bda672ee1f0b7258 (patch) | |
| tree | 6f6b3803f162cce610d4c3b292dd4864c430448f /src/com/android/settings/network | |
| parent | f5056a03e31cb12b5106e46b71bb6817e89f3115 (diff) | |
| download | packages_apps_Settings-259e6288c9f91f8144c12127bda672ee1f0b7258.tar.gz packages_apps_Settings-259e6288c9f91f8144c12127bda672ee1f0b7258.tar.bz2 packages_apps_Settings-259e6288c9f91f8144c12127bda672ee1f0b7258.zip | |
EnabledNetworkModePreferenceController Remove AllowedNetworkType
Power manager decision do enable/disable NR by AllowedNetworkType,
and it will effect the PreferredNetworkMode UI. The
PreferredNetworkMode list no 5G item when AllowedNetworkType
disabled.
Bug: 156709797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (pass)
Change-Id: I3ab9eca0956c4cce1b79e518942063b681eb96cd
Diffstat (limited to 'src/com/android/settings/network')
| -rw-r--r-- | src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index 26c206da84..d6f66a1472 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -168,7 +168,6 @@ public class EnabledNetworkModePreferenceController extends private Context mContext; private TelephonyManager mTelephonyManager; - private boolean mAllowed5gNetworkType; private boolean mIsGlobalCdma; private boolean mIs5gEntryDisplayed; private boolean mShow4gForLTE; @@ -206,9 +205,6 @@ public class EnabledNetworkModePreferenceController extends final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); final boolean isNrEnabledFromCarrierConfig = carrierConfig != null && carrierConfig.getBoolean(CarrierConfigManager.KEY_NR_ENABLED_BOOL); - mAllowed5gNetworkType = checkSupportedRadioBitmask( - mTelephonyManager.getAllowedNetworkTypes(), - TelephonyManager.NETWORK_TYPE_BITMASK_NR); mSupported5gRadioAccessFamily = isNrEnabledFromCarrierConfig && checkSupportedRadioBitmask(mTelephonyManager.getSupportedRadioAccessFamily(), TelephonyManager.NETWORK_TYPE_BITMASK_NR); @@ -572,7 +568,7 @@ public class EnabledNetworkModePreferenceController extends } /** - * Add 5G option. Only show the UI when device supported 5G and allowed 5G. + * Add 5G option. Only show the UI when device supported 5G. */ private void add5gEntry(int value) { boolean isNRValue = value >= TelephonyManagerConstants.NETWORK_MODE_NR_ONLY; @@ -585,15 +581,13 @@ public class EnabledNetworkModePreferenceController extends mIs5gEntryDisplayed = false; Log.d(LOG_TAG, "Hide 5G option. " + " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily - + " allowed5GNetworkType: " + mAllowed5gNetworkType + " isNRValue: " + isNRValue); } } private void addGlobalEntry() { Log.d(LOG_TAG, "addGlobalEntry. " - + " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily - + " allowed5GNetworkType: " + mAllowed5gNetworkType); + + " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily); mEntries.add(mContext.getString(R.string.network_global)); if (showNrList()) { mEntriesValue.add( @@ -605,7 +599,7 @@ public class EnabledNetworkModePreferenceController extends } private boolean showNrList() { - return mSupported5gRadioAccessFamily && mAllowed5gNetworkType; + return mSupported5gRadioAccessFamily; } /** |