From eeb220adf9eea613d6cd97a131b0a9ef49e31a5b Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 19 Mar 2009 23:08:36 -0700
Subject: auto import from //branches/cupcake_rel/...@141571

---
 .../api/java/util/concurrent/AbstractQueuedSynchronizerTest.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'concurrent/src/test/java/tests/api')

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) {
-- 
cgit v1.1