am 916b2b5a: Merge "Increase WFD connect time out to 60s" into jb-mr1-dev

* commit '916b2b5a932a3be1a1363ac1871e74ad8b314f00':
  Increase WFD connect time out to 60s
This commit is contained in:
Irfan Sheriff
2012-09-24 09:29:11 -07:00
committed by Android Git Automerger

View File

@@ -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;