From e8d244301ca5e2b2282d59a96a0791249d994cd2 Mon Sep 17 00:00:00 2001
From: Song Chun Fan <schfan@google.com>
Date: Tue, 8 Aug 2023 16:29:27 +0000
Subject: [PATCH] [RESTRICT AUTOMERGE][pm] Move CtsContentTestCases to
 postsubmit for pm changes

Change-Id: I740cb6c897bc936a1256131ac7218b4b71424c04
BUG: 294638249
Test: builds
---
 core/java/android/content/pm/TEST_MAPPING     | 28 +++++++++----------
 .../java/com/android/server/pm/TEST_MAPPING   |  6 ++--
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 1c1f58a19abc9..187a21e45331e 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -52,20 +52,6 @@
     }
   ],
   "presubmit-large": [
-    {
-      "name": "CtsContentTestCases",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        },
-        {
-          "exclude-annotation": "org.junit.Ignore"
-        },
-        {
-          "include-filter": "android.content.pm.cts"
-        }
-      ]
-    },
     {
       "name": "CtsUsesNativeLibraryTest",
       "options": [
@@ -151,6 +137,20 @@
     }
   ],
   "postsubmit": [
+    {
+      "name": "CtsContentTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "include-filter": "android.content.pm.cts"
+        }
+      ]
+    },
     {
       "name": "CtsAppSecurityHostTestCases",
       "options": [
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index 9c74dd795d307..9d76072cceeb5 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -81,7 +81,7 @@
       ]
     }
   ],
-  "presubmit-large": [
+  "postsubmit": [
     {
       "name": "CtsContentTestCases",
       "options": [
@@ -95,9 +95,7 @@
           "include-filter": "android.content.pm.cts"
         }
       ]
-    }
-  ],
-  "postsubmit": [
+    },
     {
       "name": "CtsPermissionTestCases",
       "options": [