From 686504cdf0f4665c37521ac724d219d9e7a77b1b Mon Sep 17 00:00:00 2001
From: Ian Kasprzak <iankaz@google.com>
Date: Fri, 30 Aug 2019 13:42:26 -0700
Subject: [PATCH] [DO NOT MERGE] Include exclude-rules in all TEST_MAPPING
 config instances.

Due to b/117880789, when TEST_MAPPING configs merge for ATP testing
the exclusion rules get dropped unless their included everywhere.

BUG: 139535125
BUG: 117880789
BUG: 139536812

Test: Forrest
Exempt-From-Owner-Approval: Disabling known failing TEST_MAPPING tests
for AOSP push to Q.

Change-Id: I275cdb78c17c6d2edb02945a41704ae6e3730217
---
 services/accessibility/TEST_MAPPING                  |  6 ++++++
 .../core/java/com/android/server/am/TEST_MAPPING     | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/services/accessibility/TEST_MAPPING b/services/accessibility/TEST_MAPPING
index d90c3bd9b4c29..45c52452afb48 100644
--- a/services/accessibility/TEST_MAPPING
+++ b/services/accessibility/TEST_MAPPING
@@ -52,6 +52,9 @@
         },
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
         }
       ]
     },
@@ -63,6 +66,9 @@
         },
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
         }
       ]
     }
diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING
index 21d4925722d0b..2c2013c89bab6 100644
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -14,6 +14,18 @@
         },
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-filter": "android.app.cts.AlarmManagerTest#testSetRepeating"
+        },
+        {
+          "exclude-filter": "android.app.cts.ServiceTest#testAppZygoteServices"
+        },
+        {
+          "exclude-filter": "android.app.cts.SystemFeaturesTest#testLocationFeatures"
+        },
+        {
+          "exclude-filter": "android.app.cts.SystemFeaturesTest#testSensorFeatures"
         }
       ]
     },