From cc89aa534de033f49e484975e5c7b5ef6b0fd4ab Mon Sep 17 00:00:00 2001
From: Ian Kasprzak <iankaz@google.com>
Date: Fri, 25 Oct 2019 16:46:06 -0700
Subject: [PATCH] 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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/audio/TEST_MAPPING b/services/core/java/com/android/server/audio/TEST_MAPPING
index 0d34c53729141..bf09eac1b4220 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"
                 }
             ]
         }