diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConnectivityManager.java | 2 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/WificondScannerImpl.java | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java index ed647cb69..8470d0c7d 100644 --- a/service/java/com/android/server/wifi/WifiConnectivityManager.java +++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java @@ -1572,7 +1572,6 @@ public class WifiConnectivityManager { cancelPeriodicScanTimer(); cancelDelayedPartialScan(); stopPnoScan(); - mScanRestartCount = 0; } /** @@ -1905,6 +1904,7 @@ public class WifiConnectivityManager { mWaitForFullBandScanResults = false; mLatestCandidates = null; mLatestCandidatesTimestampMs = 0; + mScanRestartCount = 0; } /** diff --git a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java index 4a48ed252..66e0cfbaa 100644 --- a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java +++ b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java @@ -437,12 +437,11 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call return false; } - if (startHwPnoScan(settings)) { - mLastPnoScanSettings = new LastPnoScanSettings( - mClock.getElapsedSinceBootMillis(), - settings.networkList, eventHandler); + mLastPnoScanSettings = new LastPnoScanSettings( + mClock.getElapsedSinceBootMillis(), + settings.networkList, eventHandler); - } else { + if (!startHwPnoScan(settings)) { Log.e(TAG, "Failed to start PNO scan"); reportPnoScanFailure(); } |