Merge "Mark 4 tests as FlakyTest"

am: 50242ce28a

Change-Id: I8b82c493e87eeea1d9f7fcbee79739a770e76aba

services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java

@@ -62,6 +62,7 @@ import android.os.Message;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.SystemClock;
+import android.support.test.filters.FlakyTest;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
@@ -101,6 +102,7 @@ import java.util.function.Function;
  *     com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
  */
 @SmallTest
+@FlakyTest(bugId = 113616538)
 @RunWith(AndroidJUnit4.class)
 public class ActivityManagerServiceTest {
     private static final String TAG = ActivityManagerServiceTest.class.getSimpleName();
@@ -830,4 +832,4 @@ public class ActivityManagerServiceTest {
             mRestricted = restricted;
         }
     }
-}
+}

services/tests/servicestests/src/com/android/server/am/AppErrorDialogTest.java

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.os.Handler;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.FlakyTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -36,6 +37,7 @@ import java.io.File;
  */
 @RunWith(AndroidJUnit4.class)
 @SmallTest
+@FlakyTest(bugId = 113616538)
 public class AppErrorDialogTest {
 
     private Context mContext;

services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java

@@ -42,6 +42,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.FlakyTest;
 import android.support.test.filters.MediumTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
@@ -65,6 +66,7 @@ import java.util.concurrent.TimeUnit;
  * runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/AssistDataRequesterTest.java
  */
 @MediumTest
+@FlakyTest(bugId = 113616538)
 @RunWith(AndroidJUnit4.class)
 public class AssistDataRequesterTest extends ActivityTestsBase {
 
@@ -371,4 +373,4 @@ public class AssistDataRequesterTest extends ActivityTestsBase {
             });
         }
     }
-}
+}

services/tests/servicestests/src/com/android/server/wm/TaskPositioningControllerTests.java

@@ -27,6 +27,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import android.platform.test.annotations.Presubmit;
+import android.support.test.filters.FlakyTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.view.InputChannel;
@@ -40,6 +41,7 @@ import org.junit.runner.RunWith;
  * atest com.android.server.wm.TaskPositioningControllerTests
  */
 @SmallTest
+@FlakyTest(bugId = 113616538)
 @RunWith(AndroidJUnit4.class)
 @Presubmit
 public class TaskPositioningControllerTests extends WindowTestsBase {