diff options
| author | Ningyuan Wang <nywang@google.com> | 2017-05-12 20:52:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-12 20:52:53 +0000 |
| commit | b7d05adc1f96fe0b0397e21d91696096322641d5 (patch) | |
| tree | bc647fe01209991251d342112344f0aa9fe5686f | |
| parent | c8be052d8a92ea8a6400004e29dd3da5ff5bfb81 (diff) | |
| parent | 4584366f7e40d2282d2323aab0028b6e7f805c73 (diff) | |
Merge "Do not cancel scan timeout alarm on PNO scan result" into oc-dev am: e9b2112d2f
am: 4584366f7e
Change-Id: Icb57a44bc1f34b19f2b8beeee37020b1286e3375
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/WificondScannerImpl.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java index 12024731f..590542b41 100644 --- a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java +++ b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java @@ -488,7 +488,6 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call processPendingScans(); break; case WifiMonitor.PNO_SCAN_RESULTS_EVENT: - mAlarmManager.cancel(mScanTimeoutListener); pollLatestScanDataForPno(); processPendingScans(); break; |