diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-12 20:10:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-12 20:10:19 +0000 |
| commit | e9b2112d2fe1c9b87c1bab2c52d3b33e6b3bcfb5 (patch) | |
| tree | 41f13de93c7852fbd932c9db8511ea3e8259e078 | |
| parent | 728bf64cfc9881eeb06cbe8745b1a356db980abe (diff) | |
| parent | 2739f73dec628d2493e5447b71a83fe59c143fbd (diff) | |
Merge "Do not cancel scan timeout alarm on PNO scan result" into oc-dev
| -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; |