Merge "Fix FlakyTest filter in wm/TEST_MAPPING"

2018-09-20 03:22:34 +00:00
parent ef4dda2d02 c4fa3f953a
commit 58c147fb65
1 changed files with 2 additions and 2 deletions
--- 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"
        }
      ]
    }