diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-19 23:08:36 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-19 23:08:36 -0700 |
| commit | eeb220adf9eea613d6cd97a131b0a9ef49e31a5b (patch) | |
| tree | 9a6d52c8acb14e96a6efca3ec7eeb38b6e6f85fc /concurrent | |
| parent | 7387da1059039afc7d8fd3e48e4d0712fff5dfaf (diff) | |
| download | libcore-eeb220adf9eea613d6cd97a131b0a9ef49e31a5b.zip libcore-eeb220adf9eea613d6cd97a131b0a9ef49e31a5b.tar.gz libcore-eeb220adf9eea613d6cd97a131b0a9ef49e31a5b.tar.bz2 | |
auto import from //branches/cupcake_rel/...@141571
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) { |