Merge change I1932e8f8 into eclair

* changes: Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
2009-10-20 15:13:05 -04:00
parent 61462b4370 1932e8f811
commit 76bb9a3636
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
@@ -541,7 +541,8 @@ public class HeapTest extends TestCase {
        }
    }

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