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>
2023-02-28 23:09:08 +00:00
parent 065995f3ba aaa23d9942
commit 9f821099c9
1 changed files with 3 additions and 11 deletions
--- 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": [