From f5dba8eb5e660932367fc650a2e2ca724df3734e Mon Sep 17 00:00:00 2001
From: Randy Pan <zpan@google.com>
Date: Thu, 26 May 2016 15:00:46 -0700
Subject: Reset single scan timestamp when disabling Wifi

This timestamp needs to be reset when WiFi is disabled. When WiFi
is enabled again, a connectivity scan starts immediately.
Otherwise it can be delayed because of the minimum periodic single
scan interval rule.

Bug: 28986330
Change-Id: I5a01dc267a05791eba34c87e6d9301bd998bf377
Tests: Wifi unit tests, manual test
---
 service/java/com/android/server/wifi/WifiConnectivityManager.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index 1f1a08b6a..eb9427c8b 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -1044,6 +1044,7 @@ public class WifiConnectivityManager {
 
         if (!mWifiEnabled) {
             stopConnectivityScan();
+            mLastPeriodicSingleScanTimeStamp = INVALID_TIME_STAMP;
         }
     }
 
-- 
cgit v1.2.3