From c4fa3f953adc611df271fa0c8b3f96b20d13f4c5 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 20 Sep 2018 09:48:27 +0900
Subject: [PATCH] Fix FlakyTest filter in wm/TEST_MAPPING

This is a follow up of I2d9641c68148

Bug: 113800711
Test: tradefed.sh run commandAndExit FrameworksServicesTests \
        --include-filter com.android.server.wm \
        --include-annotation android.platform.test.annotations.Presubmit \
        --exclude-annotation androidx.test.filters.FlakyTest

Change-Id: I7fa4d2cb70594431574d44d886352a2e81d8e51e
---
 services/core/java/com/android/server/wm/TEST_MAPPING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/TEST_MAPPING b/services/core/java/com/android/server/wm/TEST_MAPPING
index c99329a7508c8..0c9a14be964f0 100644
--- a/services/core/java/com/android/server/wm/TEST_MAPPING
+++ b/services/core/java/com/android/server/wm/TEST_MAPPING
@@ -21,7 +21,7 @@
           "include-annotation": "android.platform.test.annotations.Presubmit"
         },
         {
-          "exclude-annotation": "android.support.test.filters.FlakyTest"
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
     },
@@ -35,7 +35,7 @@
           "include-annotation": "android.platform.test.annotations.Presubmit"
         },
         {
-          "exclude-annotation": "android.support.test.filters.FlakyTest"
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
     }