From 3ca32118299a511ac682eb9bcc14a0ed79978bbc Mon Sep 17 00:00:00 2001
From: Joe Bolinger <jbolinger@google.com>
Date: Sat, 10 Dec 2022 02:02:12 +0000
Subject: [PATCH] Move biometric screenshot TEST_MAPPING to project root.

Test: N/A
Bug: 251476085
Change-Id: I595c8fc31b29f40c413fadf7d3cf7defdefeeae7
---
 packages/SystemUI/TEST_MAPPING                   | 12 ++++++++++++
 .../com/android/systemui/biometrics/TEST_MAPPING | 16 ----------------
 2 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/TEST_MAPPING

diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index aaee42fe05f0f..f92625bd9a73d 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -32,6 +32,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",
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 794eba4d8de97..0000000000000
--- 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"
-        }
-      ]
-    }
-  ]
-}