From e1e7b16f6944a42c8f7e818fb52239177bc0fa88 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] [pm] Move CtsContentTestCases to postsubmit for pm changes

BUG: 294638249
Test: builds
Merged-In: I453a4151100ca42495e0f2473e5599dec38ab70d
Change-Id: I740cb6c897bc936a1256131ac7218b4b71424c04
---
 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 3ffbe1d1c71bc..2ea6513c4d771 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -100,20 +100,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":[
@@ -155,6 +141,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 a622d0743bbb0..bb6e11dcf8d4e 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -90,7 +90,7 @@
       ]
     }
   ],
-  "presubmit-large": [
+  "postsubmit": [
     {
       "name": "CtsContentTestCases",
       "options": [
@@ -104,9 +104,7 @@
           "include-filter": "android.content.pm.cts"
         }
       ]
-    }
-  ],
-  "postsubmit": [
+    },
     {
       "name": "CtsPermissionTestCases",
       "options": [