| commit | d9be4157d422a1fc27e879999dff0aa63c8ca044 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri Jun 08 18:26:20 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 08 18:26:20 2012 -0700 |
| tree | 3ea347596a6a4a3c901fc0e77ed9c44ef80562e3 | |
| parent | 5611f58a1811ed550add7df41df4f5edb3b73af6 [diff] | |
| parent | 09fa23649315fdecd77745a99f56ed1131de7b6d [diff] |
Merge "Flip condition in ApacheHttpClientTest" into jb-dev
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() {