summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-09-23 17:32:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-23 17:32:07 -0700
commit916b2b5a932a3be1a1363ac1871e74ad8b314f00 (patch)
tree111156e1284acb756d78932811d806454f3160c4
parentf7a3e979a7ab3be4715408b6328f27e56a7c9326 (diff)
parent2c2ca5cb7c083cd53dee00e71af99d1abf931976 (diff)
downloadframeworks_base-916b2b5a932a3be1a1363ac1871e74ad8b314f00.zip
frameworks_base-916b2b5a932a3be1a1363ac1871e74ad8b314f00.tar.gz
frameworks_base-916b2b5a932a3be1a1363ac1871e74ad8b314f00.tar.bz2
Merge "Increase WFD connect time out to 60s" into jb-mr1-dev
-rw-r--r--services/java/com/android/server/display/WifiDisplayController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java
index 58f0445..d533c94 100644
--- a/services/java/com/android/server/display/WifiDisplayController.java
+++ b/services/java/com/android/server/display/WifiDisplayController.java
@@ -73,7 +73,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
private static final int DEFAULT_CONTROL_PORT = 7236;
private static final int MAX_THROUGHPUT = 50;
- private static final int CONNECTION_TIMEOUT_SECONDS = 30;
+ private static final int CONNECTION_TIMEOUT_SECONDS = 60;
private static final int RTSP_TIMEOUT_SECONDS = 15;
private static final int DISCOVER_PEERS_MAX_RETRIES = 10;