diff options
| author | Roshan Pius <rpius@google.com> | 2016-03-17 17:16:34 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2016-03-17 17:23:55 -0700 |
| commit | 2c9840a1063fd74eae131260fda2841566fc6d62 (patch) | |
| tree | 6272cf657a140567e2e99735fbdbfc9de2eef0a5 | |
| parent | dcd877d6c143db557884993ea437e2a432cb0ba3 (diff) | |
SupplicantWifiScanner: Connected Pno bug fixes
Missed a |isHwPnoScanRequired| check in couple of places.
Found during manual testing on Shamu with WifiConnectivityManager and
setting the HAL ePNO flag to false in HalWifiScanner.
While there,
Log |isConnected| flag in PNO scan requests
BUG: 27525899
Change-Id: I0830db7e629e7463c0e5cd3e1a12c7e6df8e6927
TEST: Compiles & unit-test passes
TEST: Manual testing on shamu
| -rw-r--r-- | service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java | 4 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiScanningServiceImpl.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java b/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java index 63031bee6..9cc685ffc 100644 --- a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java +++ b/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java @@ -689,7 +689,7 @@ public class SupplicantWifiScannerImpl extends WifiScannerImpl implements Handle } mPnoEventHandler = eventHandler; mPnoSettings = settings; - if (mHwPnoScanSupported) { + if (isHwPnoScanRequired()) { if (!setNetworkPriorities(settings.networkList)) return false; // For supplicant based PNO, we start the scan immediately when we set pno list. processPendingScans(); @@ -707,7 +707,7 @@ public class SupplicantWifiScannerImpl extends WifiScannerImpl implements Handle } mPnoEventHandler = null; mPnoSettings = null; - if (mHwPnoScanSupported) { + if (isHwPnoScanRequired()) { // For supplicant based PNO, we stop the scan immediately when we reset pno list. return stopHwPnoScan(); } else { diff --git a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java index 108a4da6c..98b4e1e78 100644 --- a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java @@ -2077,6 +2077,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { .append(" sameNetworkBonus:").append(pnoSettings.sameNetworkBonus) .append(" secureBonus:").append(pnoSettings.secureBonus) .append(" band5GhzBonus:").append(pnoSettings.band5GHzBonus) + .append(" isConnected:").append(pnoSettings.isConnected) .append(" networks:[ "); if (pnoSettings.networkList != null) { for (int i = 0; i < pnoSettings.networkList.length; i++) { |