Merge "Exclude androidx.test.filters.FlakyTest in TEST_MAPPING" into udc-dev am: bc28899ee4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24005116

Change-Id: Ia5fe4e854a3e73616abe60ebf606f933031e9f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-26 19:49:21 +00:00
committed by Automerger Merge Worker

View File

@@ -35,6 +35,9 @@
}, },
{ {
"exclude-annotation": "android.platform.test.annotations.FlakyTest" "exclude-annotation": "android.platform.test.annotations.FlakyTest"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
} }
] ]
} }
@@ -128,6 +131,9 @@
}, },
{ {
"exclude-annotation": "android.platform.test.annotations.FlakyTest" "exclude-annotation": "android.platform.test.annotations.FlakyTest"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
} }
] ]
} }