summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRandy Pan <zpan@google.com>2016-05-27 16:19:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-27 16:19:09 +0000
commiteb6b69f6c2b1e1327065c23a9ba0895ccb5f782a (patch)
treeedf420bea3615a84420f775748a7a347df37bb21 /service
parenta868a62f3e02e648f3bb6e464a32b14daa585b44 (diff)
parentbcb882b11790c1f4d64a78a0e0cb07dd0c227c6c (diff)
Merge "Reset single scan timestamp when disabling Wifi" into nyc-dev
am: bcb882b117 * commit 'bcb882b11790c1f4d64a78a0e0cb07dd0c227c6c': Reset single scan timestamp when disabling Wifi Change-Id: I8b1476fb4e79de2624c11bdd63bde3f443034a47
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiConnectivityManager.java1
1 files changed, 1 insertions, 0 deletions
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;
}
}