Merge "Mark flaky test ListActivityTest as broken." into eclairandroid-2.1_r2.1sandroid-2.1_r2eclair-sholes-release2eclair-release

1 files changed, 7 insertions, 4 deletions

diff --git a/tests/tests/app/src/android/app/cts/ListActivityTest.java b/tests/tests/app/src/android/app/cts/ListActivityTest.java
index 78a7dd96c49..43ebd05020f 100644
--- a/tests/tests/app/src/android/app/cts/ListActivityTest.java
+++ b/tests/tests/app/src/android/app/cts/ListActivityTest.java
@@ -16,6 +16,12 @@
 
 package android.app.cts;
 
+import dalvik.annotation.BrokenTest;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
 import android.app.ListActivity;
 import android.content.pm.ActivityInfo;
 import android.test.ActivityInstrumentationTestCase2;
@@ -24,10 +30,6 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
 
 @TestTargetClass(ListActivity.class)
 public class ListActivityTest extends ActivityInstrumentationTestCase2<ListActivityTestHelper> {
@@ -101,6 +103,7 @@ public class ListActivityTest extends ActivityInstrumentationTestCase2<ListActiv
             args = {android.os.Bundle.class}
         )
     })
+    @BrokenTest(value="flaky test. bug 2334738")
     public void testListActivity() throws Throwable {
         waitForAction();
         sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);