summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNingyuan Wang <nywang@google.com>2017-05-11 10:32:47 -0700
committerNingyuan Wang <nywang@google.com>2017-05-11 10:49:21 -0700
commit2739f73dec628d2493e5447b71a83fe59c143fbd (patch)
treea2b35bd2cf2d7bf2af85f2e2d250aff167ca5010
parente64cc58a5ba045a3e6b81994614e2b0a95c7add4 (diff)
Do not cancel scan timeout alarm on PNO scan result
mScanTimeoutListener is only used for single scan timeout. Canceling this time out alarm on PNO scan result may leave WificondScannerImpl in the state where it is waiting for a single scan result event forever. This causes problems because it prevents processPendingScans() to accept any new single scan requests. Bug: 38139817 Test: compile, unit tests, manual tests, integration tests Change-Id: I7a4ab04a7702986cd2de53f595dd958704cef95f
-rw-r--r--service/java/com/android/server/wifi/scanner/WificondScannerImpl.java1
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;