From b205c3ced4f394da4c7a92020b05fcb7bc751225 Mon Sep 17 00:00:00 2001
From: Julien Desprez <jdesprez@google.com>
Date: Tue, 28 Feb 2023 19:05:12 +0000
Subject: [PATCH] Deduplicate CtsSecureFrpInstallTestCases from "presubmit" and
 "presubmit-large"

Change-Id: Ib1a97c909c644e9e475b9eaedfb5a59fa75be061
Test: presubmit
Bug: 270214959
---
 core/java/android/content/pm/TEST_MAPPING | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING
index 1c1f58a19abc9..d4a24af61c9f5 100644
--- a/core/java/android/content/pm/TEST_MAPPING
+++ b/core/java/android/content/pm/TEST_MAPPING
@@ -29,6 +29,9 @@
     },
     {
       "path": "system/apex/tests"
+    },
+    {
+      "path": "cts/tests/tests/content/pm/SecureFrp"
     }
   ],
   "presubmit": [
@@ -110,17 +113,6 @@
         }
       ]
     },
-    {
-      "name": "CtsSecureFrpInstallTestCases",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        },
-        {
-          "exclude-annotation": "org.junit.Ignore"
-        }
-      ]
-    },
     {
       "name": "CtsSuspendAppsPermissionTestCases",
       "options": [