From a3e4e3a7922daf02f4fa8b2e10e3a76861053851 Mon Sep 17 00:00:00 2001
From: Julia Tuttle <juliatuttle@google.com>
Date: Wed, 11 Mar 2020 17:09:58 -0400
Subject: [PATCH] Honor org.junit.Ignore annotation.

Bug: 151135460
Test: added @Ignore to a test and checked atest didn't run it
Change-Id: Ied98fc49a85eccc5452ba8e07992a836f6fc11c5
---
 packages/SystemUI/TEST_MAPPING | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index cff958faa7e18..c036b041cd95f 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -11,6 +11,9 @@
         {
             "include-annotation": "android.platform.test.scenario.annotation.Scenario"
         },
+        {
+            "exclude-annotation": "org.junit.Ignore"
+        },
         {
             "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
@@ -27,6 +30,9 @@
         {
             "include-annotation": "android.platform.test.scenario.annotation.Scenario"
         },
+        {
+            "exclude-annotation": "org.junit.Ignore"
+        },
         {
             "exclude-annotation": "androidx.test.filters.FlakyTest"
         },