am e1df8224: Merge change 23173 into donut

Merge commit 'e1df82248a68282a4d556ce61db09949fc186827' into eclair

* commit 'e1df82248a68282a4d556ce61db09949fc186827':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
This commit is contained in:
Brett Chabot
2009-08-28 13:50:16 -07:00
committed by Android Git Automerger

View File

@@ -67,7 +67,8 @@ public class LifecycleTest extends ActivityTestsBase {
runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN); runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);
} }
@LargeTest //flaky test, removing from large suite until 1866891 is fixed
//@LargeTest
public void testDialog() throws Exception { public void testDialog() throws Exception {
mIntent = mTopIntent; mIntent = mTopIntent;
runLaunchpad(LaunchpadActivity.LIFECYCLE_DIALOG); runLaunchpad(LaunchpadActivity.LIFECYCLE_DIALOG);