Merge "Updates more CtsContentTestCases to TEST_MAPPING"

core/java/android/content/om/TEST_MAPPING

@@ -21,6 +21,20 @@
           "include-filter": "android.appsecurity.cts.OverlayHostTest"
         }
       ]
+    },
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.om.cts"
+        }
+      ]
     }
   ]
 }

core/java/android/content/pm/TEST_MAPPING

@@ -17,6 +17,20 @@
     },
     {
       "name": "CarrierAppIntegrationTestCases"
+    },
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.pm.cts"
+        }
+      ]
     }
   ],
   "postsubmit": [

core/java/android/content/res/TEST_MAPPING

@@ -2,6 +2,20 @@
   "presubmit": [
     {
       "name": "CtsResourcesLoaderTests"
+    },
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.res.cts"
+        }
+      ]
     }
   ]
 }

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

@@ -33,16 +33,13 @@
       "name": "CtsContentTestCases",
       "options": [
         {
-          "include-filter": "android.content.pm.cts.ChecksumsTest"
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
         },
         {
-          "include-filter": "android.content.pm.cts.PackageManagerShellCommandTest"
+          "exclude-annotation": "org.junit.Ignore"
         },
         {
-          "include-filter": "android.content.pm.cts.PackageManagerShellCommandIncrementalTest"
-        },
-        {
-          "include-filter": "android.content.pm.cts.PackageManagerTest"
+          "include-filter": "android.content.pm.cts"
         }
       ]
     },