From 1a5bb835885062ba815eae5de7ac34b936e846b8 Mon Sep 17 00:00:00 2001
From: Ian Kasprzak <iankaz@google.com>
Date: Thu, 29 Aug 2019 10:05:28 -0700
Subject: [PATCH] [DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495

- Moved exclude filters to existing stanzas
- Removed new stanzas added w/ filters
- Removed un-needed filters because existing "include-filter"
  already excludes failing tests.

Disabling in preparation for merge to aosp-master (Q release).

Disabling the following tests:
FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate
CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices
CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures
CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest

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

Change-Id: I4dc2408c5bc6d421654f871c5d63d402c1d96d91
---
 core/java/android/app/TEST_MAPPING                   |  8 --------
 core/java/android/provider/TEST_MAPPING              | 12 ------------
 core/java/android/view/accessibility/TEST_MAPPING    |  7 +------
 core/java/android/view/textclassifier/TEST_MAPPING   |  7 +------
 services/accessibility/TEST_MAPPING                  |  8 --------
 .../core/java/com/android/server/am/TEST_MAPPING     | 11 -----------
 6 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 core/java/android/provider/TEST_MAPPING

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 7bda75d132b23..def1f457fb4ab 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -26,14 +26,6 @@
                     "include-filter": "com.android.server.appop"
                 }
             ]
-        },
-	{
-            "name": "FrameworksCoreTests",
-            "options": [
-                {
-                    "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
-                }
-            ]
         }
     ],
     "postsubmit": [
diff --git a/core/java/android/provider/TEST_MAPPING b/core/java/android/provider/TEST_MAPPING
deleted file mode 100644
index 89ef20fb019e3..0000000000000
--- a/core/java/android/provider/TEST_MAPPING
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "presubmit": [
-        {
-            "name": "CtsProviderTestCases",
-            "options": [
-                {
-                    "exclude-filter": "android.provider.cts.MediaStore_Images_ThumbnailsTest"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/core/java/android/view/accessibility/TEST_MAPPING b/core/java/android/view/accessibility/TEST_MAPPING
index 1efe600b380fa..535a31a908a0f 100644
--- a/core/java/android/view/accessibility/TEST_MAPPING
+++ b/core/java/android/view/accessibility/TEST_MAPPING
@@ -30,12 +30,7 @@
         },
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
-    },
-    {
-      "name": "FrameworksCoreTests",
-      "options": [
+        },
         {
           "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
         }
diff --git a/core/java/android/view/textclassifier/TEST_MAPPING b/core/java/android/view/textclassifier/TEST_MAPPING
index 3e4b66d93a594..31e240bf55bbc 100644
--- a/core/java/android/view/textclassifier/TEST_MAPPING
+++ b/core/java/android/view/textclassifier/TEST_MAPPING
@@ -8,12 +8,7 @@
         },
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
-    },
-    {
-      "name": "FrameworksCoreTests",
-      "options": [
+        },
         {
           "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
         }
diff --git a/services/accessibility/TEST_MAPPING b/services/accessibility/TEST_MAPPING
index 0574a95ed5b95..d90c3bd9b4c29 100644
--- a/services/accessibility/TEST_MAPPING
+++ b/services/accessibility/TEST_MAPPING
@@ -65,14 +65,6 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
-    },
-    {
-      "name": "FrameworksCoreTests",
-      "options": [
-        {
-          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"
-        }
-      ]
     }
   ],
   "postsubmit": [
diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING
index 0195ab68a13a4..21d4925722d0b 100644
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -45,17 +45,6 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
-    },
-    {
-      "name": "CtsAppTestCases",
-      "options": [
-        {
-          "exclude-filter": "android.app.cts.ServiceTest#testAppZygoteServices"
-        },
-        {
-          "exclude-filter": "android.app.cts.SystemFeaturesTest#testLocationFeatures"
-        }
-      ]
     }
   ],
   "postsubmit": [