commit 3ca32118299a511ac682eb9bcc14a0ed79978bbc
author Joe Bolinger <jbolinger@google.com> Sat Dec 10 02:02:12 2022 +0000
committer Joe Bolinger <jbolinger@google.com> Sat Dec 10 02:02:12 2022 +0000
tree 928f9a41b9cfd441b8c525f88e8ff80de6f6ebc2
parent dff8899c7cb2538d574807e2620f086eb1650e48

Move biometric screenshot TEST_MAPPING to project root.

Test: N/A
Bug: 251476085
Change-Id: I595c8fc31b29f40c413fadf7d3cf7defdefeeae7

packages/SystemUI/TEST_MAPPING

diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index aaee42f..f92625b 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -33,6 +33,18 @@
       ]
     },
     {
+      // TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
+      "name": "SystemUIGoogleBiometricsScreenshotTests",
+      "options": [
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
       // Permission indicators
       "name": "CtsPermission4TestCases",
       "options": [

packages/SystemUI/src/com/android/systemui/biometrics/TEST_MAPPING

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/TEST_MAPPING b/packages/SystemUI/src/com/android/systemui/biometrics/TEST_MAPPING
deleted file mode 100644
index 794eba4..0000000
--- a/packages/SystemUI/src/com/android/systemui/biometrics/TEST_MAPPING
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "presubmit": [
-    {
-      // TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
-      "name": "SystemUIGoogleBiometricsScreenshotTests",
-      "options": [
-        {
-          "exclude-annotation": "org.junit.Ignore"
-        },
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
-    }
-  ]
-}