Merge change I3429f77a into eclair

* changes: Suppress flaky test HeapTest#testOomeLarge.
2009-10-06 22:35:27 -04:00
parent 26fe45dcb3 b8a4e5f79a
commit 773fd13130
1 changed files with 2 additions and 1 deletions
--- a/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java
@@ -485,7 +485,8 @@ public class HeapTest extends TestCase {
        }
    }

-    @MediumTest
+    // TODO: flaky test
+    //@MediumTest
    public void testOomeLarge() throws Exception {
        /* Just shy of the typical max heap size so that it will actually
         * try to allocate it instead of short-circuiting.