commit a740925b5a7444f9d11fdc0419a672a753ab217e
author Brian Muramatsu <btmura@google.com> Fri Jun 08 18:29:37 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 08 18:29:37 2012 -0700
tree 7d490a304199cd22bf8f5a687d5257e5e694c07f
parent fb0e930b5b939b3f5a6289eceea6c977e385273c
parent d9be4157d422a1fc27e879999dff0aa63c8ca044

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

* commit 'd9be4157d422a1fc27e879999dff0aa63c8ca044':
  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() {