commit efb9743f24044390273be6722656c2bf3ffddc7d
author Irfan Sheriff <isheriff@google.com> Wed Oct 31 13:15:58 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 31 13:15:58 2012 -0700
tree 5862b78d667371e87353d024d877a07edf11fa94
parent a27072d9cc9ca8ee39cc4d8d645f6b0721ba5c8e
parent 86c93df1d626c42147db2f2a6dfb5dcad83477ec

am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev

* commit '86c93df1d626c42147db2f2a6dfb5dcad83477ec':
  Increase timeouts for p2p

src/p2p/p2p.c

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index f038812..a3eaa8c 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -2811,7 +2811,11 @@
 			p2p_continue_find(p2p);
 		else if (p2p->user_initiated_pd) {
 			p2p->pending_action_state = P2P_PENDING_PD;
+#ifdef ANDROID_P2P
+			p2p_set_timeout(p2p, 0, 350000);
+#else
 			p2p_set_timeout(p2p, 0, 300000);
+#endif
 		}
 		return;
 	}
@@ -2828,7 +2832,11 @@
 	/* Wait for response from the peer */
 	if (p2p->state == P2P_SEARCH)
 		p2p_set_state(p2p, P2P_PD_DURING_FIND);
+#ifdef ANDROID_P2P
+	p2p_set_timeout(p2p, 0, 350000);
+#else
 	p2p_set_timeout(p2p, 0, 200000);
+#endif
 }
 
 
@@ -2943,7 +2951,11 @@
 	 * channel.
 	 */
 	p2p_set_state(p2p, P2P_CONNECT);
+#ifdef ANDROID_P2P
+	p2p_set_timeout(p2p, 0, 350000);
+#else
 	p2p_set_timeout(p2p, 0, success ? 200000 : 100000);
+#endif
 }
 
 
@@ -2959,7 +2971,11 @@
 		return;
 	}
 	p2p_set_state(p2p, P2P_CONNECT);
+#ifdef ANDROID_P2P
+	p2p_set_timeout(p2p, 0, 350000);
+#else
 	p2p_set_timeout(p2p, 0, 250000);
+#endif
 }
 
 

src/p2p/p2p_invitation.c

diff --git a/src/p2p/p2p_invitation.c b/src/p2p/p2p_invitation.c
index 769e57b..7bf6600 100644
--- a/src/p2p/p2p_invitation.c
+++ b/src/p2p/p2p_invitation.c
@@ -506,7 +506,11 @@
 	 * channel.
 	 */
 	p2p_set_state(p2p, P2P_INVITE);
+#ifdef ANDROID_P2P
+	p2p_set_timeout(p2p, 0, 350000);
+#else
 	p2p_set_timeout(p2p, 0, 100000);
+#endif
 }