diff options
| author | Roshan Pius <rpius@google.com> | 2016-04-21 11:39:35 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2016-04-21 11:39:35 -0700 |
| commit | 7ce0f144104c68da40c196c16f73e2d0bcc50cc7 (patch) | |
| tree | 360fa9ea2193959fb1bdbf41587d0d1d5f570db4 /service | |
| parent | 985df17909a5703a86f3e665abc9dd964d9623d9 (diff) | |
WifiConnectivityManager: Turn off ePno/Gscans
There is a lot of instability/unknowns for using ePno/Gscans for
connectivity purposes. Unless we've all of them hashed out, turn them
off.
BUG: 28300874
BUG: 28278197
Change-Id: Ifd650032237ac510687f0d374d31f7c9f13d18bd
TEST: Compiles & unit-test passes (Will send for ACTS testing).
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConnectivityManager.java | 4 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java index 4003d2ae0..129a52b07 100644 --- a/service/java/com/android/server/wifi/WifiConnectivityManager.java +++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java @@ -81,9 +81,9 @@ public class WifiConnectivityManager { // Due to b/28020168, timer based single scan will be scheduled every // PERIODIC_SCAN_INTERVAL_MS to provide periodic scan. - private static final boolean ENABLE_BACKGROUND_SCAN = true; + private static final boolean ENABLE_BACKGROUND_SCAN = false; // Flag to turn on connected PNO, when needed - private static final boolean ENABLE_CONNECTED_PNO_SCAN = true; + private static final boolean ENABLE_CONNECTED_PNO_SCAN = false; private final WifiStateMachine mStateMachine; private final WifiScanner mScanner; diff --git a/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java b/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java index f202a5399..6351042a8 100644 --- a/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java +++ b/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java @@ -46,11 +46,8 @@ public class HalWifiScannerImpl extends WifiScannerImpl implements Handler.Callb mSupplicantScannerDelegate = new SupplicantWifiScannerImpl(context, wifiNative, mChannelHelper, looper); - // Check if ePNO is supported by the HAL. - int halFeatureSet = mWifiNative.getSupportedFeatureSet(); - mHalBasedPnoSupported = - ((halFeatureSet & WifiManager.WIFI_FEATURE_HAL_EPNO) - == WifiManager.WIFI_FEATURE_HAL_EPNO); + // We are not going to support HAL ePNO currently. + mHalBasedPnoSupported = false; } @Override |