From 2739f73dec628d2493e5447b71a83fe59c143fbd Mon Sep 17 00:00:00 2001 From: Ningyuan Wang Date: Thu, 11 May 2017 10:32:47 -0700 Subject: 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 --- service/java/com/android/server/wifi/scanner/WificondScannerImpl.java | 1 - 1 file changed, 1 deletion(-) (limited to 'service') 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; -- cgit v1.2.3