From e726148a32e39968968f1e1a8f94bef2c4979640 Mon Sep 17 00:00:00 2001
From: Ivan Chiang <chiangi@google.com>
Date: Tue, 1 Oct 2024 06:10:53 +0000
Subject: [PM] Add PackageInstaller CUJ test case (38/N)

Add CtsPackageInstallerCUJDeviceAdminTestCases and
CtsPackageInstallerCUJMultiUsersTestCases into presubmit in
TEST_MAPPING

Flag: TEST_ONLY
Bug: 332323134
Test: atest -p frameworks/base/core/java/android/content/pm/TEST_MAPPING:presubmit
Test: atest -p frameworks/base/services/core/java/com/android/server/pm/TEST_MAPPING:presubmit
Test: atest -p frameworks/base/packages/PackageInstaller/TEST_MAPPING:presubmit
Change-Id: I0df5ce0f3e9d4b2865b24d8e876dc640b5b03f17
---
 core/java/android/content/pm/TEST_MAPPING          | 22 +++++++++++++++
 packages/PackageInstaller/TEST_MAPPING             | 22 +++++++++++++++
 .../core/java/com/android/server/pm/TEST_MAPPING   | 32 ++++++++++++++++++++++
 3 files changed, 76 insertions(+)

diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 2cdae21bde92..44f2a4ca38e2 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -113,6 +113,17 @@
                 }
             ]
         },
+        {
+            "name": "CtsPackageInstallerCUJDeviceAdminTestCases",
+            "options":[
+               {
+                   "exclude-annotation":"androidx.test.filters.FlakyTest"
+               },
+               {
+                   "exclude-annotation":"org.junit.Ignore"
+               }
+            ]
+        },
         {
             "name": "CtsPackageInstallerCUJInstallationTestCases",
             "options":[
@@ -124,6 +135,17 @@
                }
             ]
         },
+        {
+            "name": "CtsPackageInstallerCUJMultiUsersTestCases",
+            "options":[
+               {
+                   "exclude-annotation":"androidx.test.filters.FlakyTest"
+               },
+               {
+                   "exclude-annotation":"org.junit.Ignore"
+               }
+            ]
+        },
         {
             "name": "CtsPackageInstallerCUJUninstallationTestCases",
             "options":[
diff --git a/packages/PackageInstaller/TEST_MAPPING b/packages/PackageInstaller/TEST_MAPPING
index 91882fde1537..50db5018d44e 100644
--- a/packages/PackageInstaller/TEST_MAPPING
+++ b/packages/PackageInstaller/TEST_MAPPING
@@ -1,5 +1,16 @@
 {
   "presubmit": [
+    {
+      "name": "CtsPackageInstallerCUJDeviceAdminTestCases",
+      "options":[
+        {
+          "exclude-annotation":"androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation":"org.junit.Ignore"
+        }
+      ]
+    },
     {
       "name": "CtsPackageInstallerCUJInstallationTestCases",
       "options":[
@@ -11,6 +22,17 @@
         }
       ]
     },
+    {
+      "name": "CtsPackageInstallerCUJMultiUsersTestCases",
+      "options":[
+        {
+          "exclude-annotation":"androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation":"org.junit.Ignore"
+        }
+      ]
+    },
     {
       "name": "CtsPackageInstallerCUJUninstallationTestCases",
       "options":[
diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING
index 21a6df203015..94b49e538621 100644
--- a/services/core/java/com/android/server/pm/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/TEST_MAPPING
@@ -100,6 +100,22 @@
         }
       ]
     },
+    {
+      "name": "CtsPackageInstallerCUJDeviceAdminTestCases",
+      "file_patterns": [
+        "core/java/.*Install.*",
+        "services/core/.*Install.*",
+        "services/core/java/com/android/server/pm/.*"
+      ],
+      "options":[
+          {
+              "exclude-annotation":"androidx.test.filters.FlakyTest"
+          },
+          {
+              "exclude-annotation":"org.junit.Ignore"
+          }
+      ]
+    },
     {
       "name": "CtsPackageInstallerCUJInstallationTestCases",
       "file_patterns": [
@@ -116,6 +132,22 @@
           }
       ]
     },
+    {
+      "name": "CtsPackageInstallerCUJMultiUsersTestCases",
+      "file_patterns": [
+        "core/java/.*Install.*",
+        "services/core/.*Install.*",
+        "services/core/java/com/android/server/pm/.*"
+      ],
+      "options":[
+          {
+              "exclude-annotation":"androidx.test.filters.FlakyTest"
+          },
+          {
+              "exclude-annotation":"org.junit.Ignore"
+          }
+      ]
+    },
     {
       "name": "CtsPackageInstallerCUJUninstallationTestCases",
       "file_patterns": [
-- 
cgit v1.2.3-59-g8ed1b