commit 9f821099c9114d9dbdb6644575924a8a0ce16a17
author Julien Desprez <jdesprez@google.com> Tue Feb 28 23:09:08 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 28 23:09:08 2023 +0000
tree 6180ccfc8318c27c773e5cb80aaec762e6f4c307
parent 065995f3ba1fa6c8fdda5557e5752293d043ca57
parent aaa23d9942d722ad20f9c181204ef5920cd4a20b

Merge "Deduplicate CtsSecureFrpInstallTestCases from "presubmit" and "presubmit-large"" am: 451a398b78 am: aaa23d9942

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

Change-Id: I0e47aff7ac75da0bb4ad6b37234410479deaa26e
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..d4a24af 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": [
@@ -111,17 +114,6 @@
       ]
     },
     {
-      "name": "CtsSecureFrpInstallTestCases",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        },
-        {
-          "exclude-annotation": "org.junit.Ignore"
-        }
-      ]
-    },
-    {
       "name": "CtsSuspendAppsPermissionTestCases",
       "options": [
         {