From 85632c84851cbd44d10276b2b06e36f5a3ef4995 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Fri, 2 Dec 2022 12:10:58 -0800
Subject: [PATCH] Include CtsAppFgsTestCases and CtsShortFgsTestCases in
 presubmit

Bug: 254662522
Bug: 246792057
Test: treehugger
Change-Id: I9878debf94549f53713bf158773768aed73ab09f
---
 core/java/android/content/pm/TEST_MAPPING     | 30 +++++++++++++++++++
 .../java/com/android/server/am/TEST_MAPPING   | 28 +++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 1c1f58a19abc9..45e0efb466168 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -42,6 +42,36 @@
     {
       "name": "ApkVerityTest"
     },
+    {
+      "name": "CtsAppFgsTestCases",
+      "file_patterns": ["(/|^)ServiceInfo[^/]*"],
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.LargeTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsShortFgsTestCases",
+      "file_patterns": ["(/|^)ServiceInfo[^/]*"],
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.LargeTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
     {
       "name": "CtsIncrementalInstallHostTestCases",
       "options": [
diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING
index 060e3eef88ec2..2a693634087b7 100644
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -17,6 +17,34 @@
         }
       ]
     },
+    {
+      "name": "CtsAppFgsTestCases",
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.LargeTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsShortFgsTestCases",
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.LargeTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
     {
       "name": "FrameworksServicesTests",
       "options": [