commit 5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2
author Brett Chabot <brettchabot@android.com> Wed Oct 21 22:21:40 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 21 22:21:40 2009 -0700
tree 8b3c8f3f7f0dde7a374c2e659b975d5ff6581968
parent 98a7c45416c5524a535dfddf3185c055d9838371
parent 76bb9a363633b5741937ebe58b01a8b2024753b0

am 76bb9a36: Merge change I1932e8f8 into eclair

Merge commit '76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-mr2

* commit '76bb9a363633b5741937ebe58b01a8b2024753b0':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.

tests/AndroidTests/src/com/android/unit_tests/HeapTest.java

diff --git a/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java b/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java
index d51cc26..f6ae6f6 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/HeapTest.java
@@ -541,7 +541,8 @@
         }
     }
 
-    @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.