commit 15137fa0d666787c5c7c8d2790ef6e1d846653ca
author Brian Muramatsu <btmura@google.com> Fri Jun 08 18:32:23 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 08 18:32:23 2012 -0700
tree a882642cd11f8eece8ad416a79b1f2debe0a9366
parent cb1a593a9deb0a35358c71870a4db6d9a5dd567c
parent a740925b5a7444f9d11fdc0419a672a753ab217e

am a740925b: am d9be4157: Merge "Flip condition in ApacheHttpClientTest" into jb-dev

* commit 'a740925b5a7444f9d11fdc0419a672a753ab217e':
  Flip condition in ApacheHttpClientTest

tests/tests/net/src/android/net/http/cts/ApacheHttpClientTest.java

diff --git a/tests/tests/net/src/android/net/http/cts/ApacheHttpClientTest.java b/tests/tests/net/src/android/net/http/cts/ApacheHttpClientTest.java
index e4846fd..7d9189f 100644
--- a/tests/tests/net/src/android/net/http/cts/ApacheHttpClientTest.java
+++ b/tests/tests/net/src/android/net/http/cts/ApacheHttpClientTest.java
@@ -200,7 +200,7 @@
         }
 
         public boolean waitForStateChange() throws InterruptedException {
-            return hasExpectedState() || mReceiveLatch.await(30, TimeUnit.SECONDS);
+            return mReceiveLatch.await(30, TimeUnit.SECONDS) || hasExpectedState();
         }
 
         private boolean hasExpectedState() {