Merge "Mark RemoteAnimationControllerTest#testTimeout as flaky" into qt-dev am: 80c94712de

am: 2fd4e812bb

Change-Id: Ie867b2acfd2d9101c4434493cd1128376de44cfd
This commit is contained in:
Vishnu Nair
2019-05-25 00:22:44 -07:00
committed by android-build-merger

View File

@@ -40,6 +40,7 @@ import android.view.RemoteAnimationTarget;
import android.view.SurfaceControl;
import android.view.SurfaceControl.Transaction;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.SmallTest;
import com.android.server.testutils.OffsettableClock;
@@ -131,6 +132,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase {
}
@Test
@FlakyTest(bugId = 133372977)
public void testTimeout() throws Exception {
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mAppToken,