commit ddde4bfa1cf4240a96fcc4d6d7e7b9ce35636e1e
author Julien Desprez <jdesprez@google.com> Wed Mar 01 14:24:06 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 01 14:24:06 2023 +0000
tree f84ce22a4edbc3842ae474d84b3a55272cac368d
parent d945bd9083087d3ad165ded8872526057db114ea
parent 9f821099c9114d9dbdb6644575924a8a0ce16a17

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

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

Change-Id: I6c49dc9529dfc6c5ec06d3bfbbc86387b5343c1a
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 45e0efb..f440ac7 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": [
@@ -141,17 +144,6 @@
       ]
     },
     {
-      "name": "CtsSecureFrpInstallTestCases",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        },
-        {
-          "exclude-annotation": "org.junit.Ignore"
-        }
-      ]
-    },
-    {
       "name": "CtsSuspendAppsPermissionTestCases",
       "options": [
         {