Merge "Sync TEST_MAPPING file from master branch"

am: 38b83f0558 Change-Id: Ie836bbf345dfd54f657b96bc02b2c44c166d93f4
2019-10-05 12:25:17 -07:00
parent 05430c9d1f 38b83f0558
commit fbf163294a
1 changed files with 13 additions and 0 deletions
--- a/services/devicepolicy/TEST_MAPPING
+++ b/services/devicepolicy/TEST_MAPPING
@@ -1,4 +1,17 @@
 {
+  "presubmit": [
+    {
+      "name": "CtsDevicePolicyManagerTestCases",
+      "options": [
+        {
+          "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+        },
+        {
+          "exclude-annotation": "android.platform.test.annotations.LargeTest"
+        }
+      ]
+    }
+  ],
  "postsubmit": [
    {
      "name": "CtsDevicePolicyManagerTestCases"