Merge "Add TEST_MAPPINGs for toasts"

core/java/android/app/TEST_MAPPING

@@ -35,6 +35,19 @@
                     "include-filter": "android.permission2.cts.RuntimePermissionProperties"
                 }
             ]
+        },
+        {
+            "name": "CtsToastTestCases",
+            "file_patterns": ["INotificationManager\\.aidl"]
+        },
+        {
+            "name": "CtsWindowManagerDeviceTestCases",
+            "options": [
+                {
+                    "include-filter": "android.server.wm.ToastTest"
+                }
+            ],
+            "file_patterns": ["INotificationManager\\.aidl"]
         }
     ],
     "postsubmit": [

core/java/android/widget/TEST_MAPPING

@@ -3,5 +3,20 @@
     {
       "path": "cts/tests/tests/widget"
     }
+  ],
+  "presubmit": [
+    {
+      "name": "CtsToastTestCases",
+      "file_patterns": ["Toast\\.java"]
+    },
+    {
+      "name": "CtsWindowManagerDeviceTestCases",
+      "options": [
+        {
+          "include-filter": "android.server.wm.ToastTest"
+        }
+      ],
+      "file_patterns": ["Toast\\.java"]
+    }
   ]
 }

services/core/java/com/android/server/TEST_MAPPING

@@ -23,6 +23,19 @@
         },
         {
             "name": "CtsLocationNoneTestCases"
+        },
+        {
+            "name": "CtsToastTestCases",
+            "file_patterns": ["NotificationManagerService\\.java"]
+        },
+        {
+            "name": "CtsWindowManagerDeviceTestCases",
+            "options": [
+                {
+                    "include-filter": "android.server.wm.ToastTest"
+                }
+            ],
+            "file_patterns": ["NotificationManagerService\\.java"]
         }
     ]
 }