commit 548fbbd0c596c1ec1bd4527de6ed839f509d1be8
author The Android Automerger <android-build@android.com> Fri Nov 02 17:34:42 2012 -0700
committer The Android Automerger <android-build@android.com> Fri Nov 02 17:34:42 2012 -0700
tree 9be9526eddbc4d94771e034c6377e776323303d3
parent 85c4f329001b9837f4ad9e6ef9fdf68c2d1eb6bd
parent 1eb348566717ff67f781f04e7498405b5b294eaf

merge in jb-mr1-release history after reset to jb-mr1-dev

luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java

diff --git a/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
index 5185885..19c6229 100644
--- a/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
+++ b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
@@ -224,7 +224,7 @@
         }
 
         /**
-         * Asserts that the actual duration is within 5% of the
+         * Asserts that the actual duration is within 10% of the
          * given expected time.
          *
          * @param expectedMillis the expected duration, in milliseconds
@@ -234,9 +234,9 @@
              * Allow a bit more slop for the maximum on "expected
              * instantaneous" results.
              */
-            long minimum = (long) ((double) expectedMillis * 0.95);
+            long minimum = (long) ((double) expectedMillis * 0.90);
             long maximum =
-                Math.max((long) ((double) expectedMillis * 1.05), 10);
+                Math.max((long) ((double) expectedMillis * 1.10), 10);
             long waitMillis = Math.max(expectedMillis * 10, 10);
             long duration = getDurationMillis(waitMillis);