Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f2ae667 authored by Brett Chabot's avatar Brett Chabot Committed by Android Git Automerger
Browse files

am 76bb9a36: Merge change I1932e8f8 into eclair

Merge commit '76bb9a36' into eclair-mr2

* commit '76bb9a36':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
parents 98a7c454 76bb9a36
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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.