diff options
| author | 2018-09-20 03:22:34 +0000 | |
|---|---|---|
| committer | 2018-09-20 03:22:34 +0000 | |
| commit | 58c147fb65f2c8aa41c0dcc1b33d6b20ff96ffbf (patch) | |
| tree | 595520d05c51c7d1e7bd3f08e43700d271966d11 | |
| parent | ef4dda2d0290fbb3d67ea8ebed703ed616e2877b (diff) | |
| parent | c4fa3f953adc611df271fa0c8b3f96b20d13f4c5 (diff) | |
Merge "Fix FlakyTest filter in wm/TEST_MAPPING"
| -rw-r--r-- | services/core/java/com/android/server/wm/TEST_MAPPING | 4 |
1 files 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 c99329a7508c..0c9a14be964f 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" } ] } |