commit 579c900beb2b6a55306cb2617cd46fa30c97adaf
author Marco Nelissen <marcone@google.com> Tue Oct 29 08:02:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 29 08:02:15 2019 -0700
tree da19024d314a095ba2598ba592f0b6eb034d3f16
parent 4dd1013a045d1a29fdae3f676b49942d5e8bc0a5
parent 00639037d774dd7baf06cdf1e7d826c5d17b80a4

Merge "Declare Visualizer::setEnabled() 'final'"
am: 00639037d7

Change-Id: Ie34e205683ed831dd6dbb7a556323c04fb0b949c

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 bf09eac..0d34c53 100644
--- a/services/core/java/com/android/server/audio/TEST_MAPPING
+++ b/services/core/java/com/android/server/audio/TEST_MAPPING
@@ -8,9 +8,6 @@
                 },
                 {
                     "include-filter": "android.media.cts.AudioFocusTest"
-                },
-                {
-                    "exclude-annotation": "androidx.test.filters.FlakyTest"
                 }
             ]
         }