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

Commit 1615ccc8 authored by Brett Chabot's avatar Brett Chabot Committed by Android Git Automerger
Browse files

am e1df8224: Merge change 23173 into donut 

Merge commit 'e1df8224' into eclair

* commit 'e1df8224':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
parents 421f5f71 e1df8224

tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ public class LifecycleTest extends ActivityTestsBase { 
        runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);

    }



    @LargeTest

    //flaky test, removing from large suite until 1866891 is fixed

    //@LargeTest

    public void testDialog() throws Exception {

        mIntent = mTopIntent;

        runLaunchpad(LaunchpadActivity.LIFECYCLE_DIALOG);