commit 01dcd498d2f5773aae1fbbf5ed54c632923e872e
author Hsin-Yi Chen <hsinyichen@google.com> Thu Feb 08 04:38:14 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 08 04:38:14 2018 +0000
tree 69f4678b6372c209127bb06f2346cabbe33ff0e4
parent 5c480c2219edbb709e67439b62761ed443c27c31
parent 42302f39dd45246f340390d8f2c1e12c2a7c7dcf

Merge "Exclude CtsDeviceJankUi#testScrolling from cts-reference-aosp" into oreo-cts-dev
am: 42302f39dd

Change-Id: If49fdf8d31571cbc0be32db016f4022904511dcb

tools/cts-tradefed/res/config/cts-reference-aosp.xml

diff --git a/tools/cts-tradefed/res/config/cts-reference-aosp.xml b/tools/cts-tradefed/res/config/cts-reference-aosp.xml
index c208500..bedbb4b 100644
--- a/tools/cts-tradefed/res/config/cts-reference-aosp.xml
+++ b/tools/cts-tradefed/res/config/cts-reference-aosp.xml
@@ -169,4 +169,7 @@
     <!-- b/65561379: Exclude android.media.cts.MediaPlayerFlakyNetworkTest -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaPlayerFlakyNetworkTest" />
 
+    <!-- b/69720253: GSI uses launcher2 in O -->
+    <option name="compatibility:exclude-filter" value="CtsJankDeviceTestCases android.jank.cts.ui.CtsDeviceJankUi#testScrolling" />
+
 </configuration>