summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitchell Wills <mwills@google.com>2015-10-13 18:11:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-13 18:11:53 +0000
commit6b6673a22801bcbb13c5e0beac7e3bfd3a390de6 (patch)
treeadb947b189ba46fc4203ca7a022708dc992c37bb
parentb14cbd44f066a43dd6c5de0efe8533ce0cdaaf95 (diff)
parentca45280461867c973acb736f6e8efe1518c03dc9 (diff)
downloadandroid_frameworks_opt_net_wifi-6b6673a22801bcbb13c5e0beac7e3bfd3a390de6.tar.gz
android_frameworks_opt_net_wifi-6b6673a22801bcbb13c5e0beac7e3bfd3a390de6.tar.bz2
android_frameworks_opt_net_wifi-6b6673a22801bcbb13c5e0beac7e3bfd3a390de6.zip
am ca452804: am d3ae426c: When entering disconnected state imediatly start a scan
* commit 'ca45280461867c973acb736f6e8efe1518c03dc9': When entering disconnected state imediatly start a scan
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 89c394dea..d5a754746 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -9301,9 +9301,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
} else {
if (mScreenOn) {
/**
- * screen lit and => delayed timer
+ * screen lit and => start scan immediately
*/
- startDelayedScan(500, null, null);
+ startScan(UNKNOWN_SCAN_SOURCE, 0, null, null);
} else {
/**
* screen dark and PNO supported => scan alarm disabled