diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-04 19:22:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-04 19:22:32 +0000 |
| commit | 7ce813a6129ab0c0b812b27e332730a8a2165d43 (patch) | |
| tree | b133404383ad29bad8ffc6a917982aabebb1963d /service/java/com/android/server/wifi/scanner | |
| parent | 988256f6c383c2c6b24d295c2f2e7ce77ec9955f (diff) | |
| parent | e6b6ab66c49702d3358b4894d28e322ea9534a84 (diff) | |
| download | android_frameworks_opt_net_wifi-7ce813a6129ab0c0b812b27e332730a8a2165d43.tar.gz android_frameworks_opt_net_wifi-7ce813a6129ab0c0b812b27e332730a8a2165d43.tar.bz2 android_frameworks_opt_net_wifi-7ce813a6129ab0c0b812b27e332730a8a2165d43.zip | |
Merge "Fail scan request if no channels are available" into oc-mr1-dev
Diffstat (limited to 'service/java/com/android/server/wifi/scanner')
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/WificondScannerImpl.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java index 12a0bdee0..ed25e0f67 100644 --- a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java +++ b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java @@ -422,11 +422,22 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call mPendingSingleScanEventHandler = null; } - if ((newScanSettings.backgroundScanActive || newScanSettings.singleScanActive) - && !allFreqs.isEmpty()) { - pauseHwPnoScan(); - Set<Integer> freqs = allFreqs.getScanFreqs(); - boolean success = mWifiNative.scan(freqs, hiddenNetworkSSIDSet); + if (newScanSettings.backgroundScanActive || newScanSettings.singleScanActive) { + boolean success = false; + Set<Integer> freqs; + if (!allFreqs.isEmpty()) { + pauseHwPnoScan(); + freqs = allFreqs.getScanFreqs(); + success = mWifiNative.scan(freqs, hiddenNetworkSSIDSet); + if (!success) { + Log.e(TAG, "Failed to start scan, freqs=" + freqs); + } + } else { + // There is a scan request but no available channels could be scanned for. + // We regard it as a scan failure in this case. + Log.e(TAG, "Failed to start scan because there is " + + "no available channel to scan for"); + } if (success) { // TODO handle scan timeout if (DBG) { @@ -439,7 +450,6 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call mClock.getElapsedSinceBootMillis() + SCAN_TIMEOUT_MS, TIMEOUT_ALARM_TAG, mScanTimeoutListener, mEventHandler); } else { - Log.e(TAG, "Failed to start scan, freqs=" + freqs); // indicate scan failure async mEventHandler.post(new Runnable() { public void run() { |