diff options
| author | SongFerng Wang <songferngwang@google.com> | 2020-06-01 02:46:17 +0000 |
|---|---|---|
| committer | SongFerng Wang <songferngwang@google.com> | 2020-06-01 06:25:13 +0000 |
| commit | 893107fc6084d5a9da842f709dcdcf570c3bc235 (patch) | |
| tree | 864c4ee08a16577d488524b4fd855413bcde7e37 /src/com/android/settings/network | |
| parent | 73b6bfc1e876f6fed4ed7c70d9f508d1a0784649 (diff) | |
| download | packages_apps_Settings-893107fc6084d5a9da842f709dcdcf570c3bc235.tar.gz packages_apps_Settings-893107fc6084d5a9da842f709dcdcf570c3bc235.tar.bz2 packages_apps_Settings-893107fc6084d5a9da842f709dcdcf570c3bc235.zip | |
Revert "EnabledNetworkModePreferenceController Remove AllowedNetworkType"
This reverts commit 259e6288c9f91f8144c12127bda672ee1f0b7258.
Reason for revert: Sooraj will implement another API for power manager.
Bug: 156709797
Change-Id: I15ee2799574cdf0318e593500f0dbfbf135d71f8
Diffstat (limited to 'src/com/android/settings/network')
| -rw-r--r-- | src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index d6f66a1472..26c206da84 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -168,6 +168,7 @@ public class EnabledNetworkModePreferenceController extends private Context mContext; private TelephonyManager mTelephonyManager; + private boolean mAllowed5gNetworkType; private boolean mIsGlobalCdma; private boolean mIs5gEntryDisplayed; private boolean mShow4gForLTE; @@ -205,6 +206,9 @@ 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); @@ -568,7 +572,7 @@ public class EnabledNetworkModePreferenceController extends } /** - * Add 5G option. Only show the UI when device supported 5G. + * Add 5G option. Only show the UI when device supported 5G and allowed 5G. */ private void add5gEntry(int value) { boolean isNRValue = value >= TelephonyManagerConstants.NETWORK_MODE_NR_ONLY; @@ -581,13 +585,15 @@ 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); + + " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily + + " allowed5GNetworkType: " + mAllowed5gNetworkType); mEntries.add(mContext.getString(R.string.network_global)); if (showNrList()) { mEntriesValue.add( @@ -599,7 +605,7 @@ public class EnabledNetworkModePreferenceController extends } private boolean showNrList() { - return mSupported5gRadioAccessFamily; + return mSupported5gRadioAccessFamily && mAllowed5gNetworkType; } /** |