diff options
| author | Jorg Pleumann <> | 2009-03-24 17:38:11 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 17:38:11 -0700 |
| commit | fbbc12cf08f0bd2fc2f91d1ba57229e5dc6c62d9 (patch) | |
| tree | 4f87738d0d66e24ff893ff5b4190394091fcad16 /concurrent | |
| parent | 5d287a9d9768195f53e244414b465ec4a6f72625 (diff) | |
| download | libcore-fbbc12cf08f0bd2fc2f91d1ba57229e5dc6c62d9.zip libcore-fbbc12cf08f0bd2fc2f91d1ba57229e5dc6c62d9.tar.gz libcore-fbbc12cf08f0bd2fc2f91d1ba57229e5dc6c62d9.tar.bz2 | |
Automated import from //branches/master/...@140414,140414
Diffstat (limited to 'concurrent')
| -rw-r--r-- | concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java b/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java index eed8d3a..7102c14 100644 --- a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java +++ b/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java @@ -1044,9 +1044,11 @@ public class AbstractQueuedSynchronizerTest extends JSR166TestCase { try { t.start(); - Thread.sleep(SHORT_DELAY_MS); + // BEGIN android-changed + Thread.sleep(SMALL_DELAY_MS); // SHORT_DELAY_MS was flaky on Android t.interrupt(); - t.join(SHORT_DELAY_MS); + t.join(SMALL_DELAY_MS); // SHORT_DELAY_MS was flaky on Android + // END android-changed assertFalse(t.isAlive()); } catch (Exception ex) { |