summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-07-26 19:49:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 19:49:21 +0000
commitf81ceadead5e98c7aea36b6ddafbf9d57de79fb7 (patch)
tree956e27449e69b6c634316cb7b16b04c074d338c4
parent377f4a2f0faccd19a9e4875538fc0224ac1ff312 (diff)
parentbc28899ee407089a7afe0f63abd20138152821c4 (diff)
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>
-rw-r--r--packages/SystemUI/TEST_MAPPING6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index 01e6bf00a664..3af7a4502856 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -35,6 +35,9 @@
},
{
"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": "androidx.test.filters.FlakyTest"
}
]
}