commit cc89aa534de033f49e484975e5c7b5ef6b0fd4ab
author Ian Kasprzak <iankaz@google.com> Fri Oct 25 16:46:06 2019 -0700
committer Ian Kasprzak <iankaz@google.com> Fri Oct 25 17:22:05 2019 -0700
tree fa98ece2450a1fe44563d0507e96faefae59ac42
parent 04d8813a01926d7bd3fec6ada937c364b469497a

Ignore FlakyTests in test-mapping.

(Merged-In tag to prevent merging to qt-r1-dev-plus-aosp and downstream)

Test: N/A
Bug: 142395610

Change-Id: Ib7b9aab429b59fa1fcd9638f4733147a17cbd4ef
Merged-In: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10

services/core/java/com/android/server/audio/TEST_MAPPING

diff --git a/services/core/java/com/android/server/audio/TEST_MAPPING b/services/core/java/com/android/server/audio/TEST_MAPPING
index 0d34c53..bf09eac 100644
--- a/services/core/java/com/android/server/audio/TEST_MAPPING
+++ b/services/core/java/com/android/server/audio/TEST_MAPPING
@@ -8,6 +8,9 @@
                 },
                 {
                     "include-filter": "android.media.cts.AudioFocusTest"
+                },
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
                 }
             ]
         }