commit a433a54f783a4e1247231a36292a9a1e5bfaf2fd
author Song Chun Fan <schfan@google.com> Fri Aug 11 20:49:38 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 11 20:49:38 2023 +0000
tree aca3aa4f3d7ee023a03f58e9148c09aa82a7ada3
parent 5f48e533c4d0ef69a7f6649c82b88dbcbe50a2c1
parent cc4764ad8dcd0088c810a77ece487abb1e1efbd9

[RESTRICT AUTOMERGE][pm] Move CtsContentTestCases to postsubmit for pm changes am: e8d244301c am: cc4764ad8d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24357433

Change-Id: I9541bc577c5b49714c86e74db70a913cca75098e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/content/pm/TEST_MAPPING

diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 1c1f58a..187a21e 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -53,20 +53,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": [
         {
@@ -152,6 +138,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": [
         {

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

diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index 9c74dd7..9d76072 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": [