diff options
| author | Ben Cheng <bccheng@android.com> | 2010-03-15 10:07:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-15 10:07:13 -0700 |
| commit | c1b5fa5c7aece8b7e8218ddc931c0f56ccd68b74 (patch) | |
| tree | 653ee4a1e9debac968f487f83d87cda2fbf6cf06 /concurrent | |
| parent | be9acc35407b5440f8b12cc0bc12d462d8f8d53f (diff) | |
| parent | f157bf4ddb49f3484713b592d1cd969ed89b870f (diff) | |
| download | libcore-c1b5fa5c7aece8b7e8218ddc931c0f56ccd68b74.zip libcore-c1b5fa5c7aece8b7e8218ddc931c0f56ccd68b74.tar.gz libcore-c1b5fa5c7aece8b7e8218ddc931c0f56ccd68b74.tar.bz2 | |
am bcdd4b09: Increase the SHORT_DELAY amount in the JSR166 test.
Merge commit 'bcdd4b09d018f24aaa61311f3e543636f7eb4095' into dalvik-dev
* commit 'bcdd4b09d018f24aaa61311f3e543636f7eb4095':
Increase the SHORT_DELAY amount in the JSR166 test.
Diffstat (limited to 'concurrent')
| -rw-r--r-- | concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java | 5 |
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 4e0de95..6acd363 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 } |