summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Cheng <bccheng@android.com>2010-03-14 23:04:49 -0700
committerBen Cheng <bccheng@android.com>2010-03-14 23:04:49 -0700
commitf157bf4ddb49f3484713b592d1cd969ed89b870f (patch)
treec20c9bc89e711cb4deb34014c439fe75c2fa5982
parent014aa1a70743ae7e6ec0de1555f5b43d43844cf4 (diff)
downloadlibcore-f157bf4ddb49f3484713b592d1cd969ed89b870f.zip
libcore-f157bf4ddb49f3484713b592d1cd969ed89b870f.tar.gz
libcore-f157bf4ddb49f3484713b592d1cd969ed89b870f.tar.bz2
Increase the SHORT_DELAY amount in the JSR166 test.
Change-Id: I890621226c5ea412baee568f3e9b31833185849a
-rw-r--r--concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java b/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java
index c900616..1c872f1 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java
+++ b/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java
@@ -168,7 +168,10 @@ public class JSR166TestCase extends TestCase {
* be reimplemented to use for example a Property.
*/
protected long getShortDelay() {
- return 50;
+ // BEGIN android-changed
+ // original value is 50
+ return 250;
+ // END android-changed
}