summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2017-06-08 22:07:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-08 22:07:12 +0000
commit3655a6ed786cbcad87bc0827b42e1811076a68b1 (patch)
tree1adf54306709c591ad722ae7919f80f6bc57cd8b
parent95bad763cff555fcf37442d5d3129f777bb0b978 (diff)
parentb97757e4930ae6e9a5319e071d383c464fcb5546 (diff)
downloadandroid_frameworks_opt_net_wifi-3655a6ed786cbcad87bc0827b42e1811076a68b1.tar.gz
android_frameworks_opt_net_wifi-3655a6ed786cbcad87bc0827b42e1811076a68b1.tar.bz2
android_frameworks_opt_net_wifi-3655a6ed786cbcad87bc0827b42e1811076a68b1.zip
Merge "WifiMonitor: Connect to wpa_supplicant more aggressively" into oc-dev
-rw-r--r--service/java/com/android/server/wifi/WifiMonitor.java4
-rw-r--r--service/java/com/android/server/wifi/p2p/WifiP2pMonitor.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java
index 385bfccaa..b2fc56e25 100644
--- a/service/java/com/android/server/wifi/WifiMonitor.java
+++ b/service/java/com/android/server/wifi/WifiMonitor.java
@@ -179,9 +179,9 @@ public class WifiMonitor {
if (mConnected) {
return true;
}
- if (connectTries++ < 5) {
+ if (connectTries++ < 50) {
try {
- Thread.sleep(1000);
+ Thread.sleep(100);
} catch (InterruptedException ignore) {
}
} else {
diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pMonitor.java b/service/java/com/android/server/wifi/p2p/WifiP2pMonitor.java
index 0411f3073..e14c10c91 100644
--- a/service/java/com/android/server/wifi/p2p/WifiP2pMonitor.java
+++ b/service/java/com/android/server/wifi/p2p/WifiP2pMonitor.java
@@ -158,9 +158,9 @@ public class WifiP2pMonitor {
if (mConnected) {
return true;
}
- if (connectTries++ < 5) {
+ if (connectTries++ < 50) {
try {
- Thread.sleep(1000);
+ Thread.sleep(100);
} catch (InterruptedException ignore) {
}
} else {