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

Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev

Browse Source
This commit is contained in:
Nathan Harold
2020-03-10 16:35:02 +00:00
committed by Android (Google) Code Review
parent 1334a7e986 adbc1ac905
commit a8bee76d11
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/network/telephony/NetworkScanHelper.java
View File

@@ -113,12 +113,19 @@ public class NetworkScanHelper {
radioAccessSpecifiers.add( radioAccessSpecifiers.add(
new RadioAccessSpecifier(AccessNetworkType.EUTRAN, null, null)); new RadioAccessSpecifier(AccessNetworkType.EUTRAN, null, null));
} }
if (networkTypeBitmap3gpp == 0 // If a device supports 5G stand-alone then the code below should be re-enabled; however
|| (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_5G) != 0) { // a device supporting only non-standalone mode cannot perform PLMN selection and camp on
radioAccessSpecifiers.add( // a 5G network, which means that it shouldn't scan for 5G at the expense of battery as
new RadioAccessSpecifier(AccessNetworkType.NGRAN, null, null)); // part of the manual network selection process.
} //
// FIXME(b/151119451): re-enable this code once there is a way to distinguish SA from NSA
// support in the modem.
//
// if (networkTypeBitmap3gpp == 0
// || (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_5G) != 0) {
// radioAccessSpecifiers.add(
// new RadioAccessSpecifier(AccessNetworkType.NGRAN, null, null));
// }
return new NetworkScanRequest( return new NetworkScanRequest(
NetworkScanRequest.SCAN_TYPE_ONE_SHOT, NetworkScanRequest.SCAN_TYPE_ONE_SHOT,