am 5f2ae667: am 76bb9a36: Merge change I1932e8f8 into eclair

Merge commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2' into eclair-mr2-plus-aosp

* commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
This commit is contained in:
Brett Chabot
2009-10-21 22:33:53 -07:00
committed by Android Git Automerger

View File

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