From 47c1accb59dc579753d48ee50ecef739c442b880 Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Tue, 11 Aug 2020 00:10:32 +0800
Subject: [PATCH] Add TEST_MAPPINGs for autofill in Activity path

Autofill broken tests (b/162203720) that weren't executed in the
presubmit. Add the fail tests into TEST_MAPPING to make sure tests
can be tested in presubmit.

Bug: 154961272
Test: atest --test-mapping frameworks/base/core/java/android/app/
Test: TreeHugger
Change-Id: Ifaefa6fae08d698b770e43830a62b3afb5b4edc5
---
 core/java/android/app/TEST_MAPPING | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index fe509dea2def9..4139b2faeb1b2 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -65,6 +65,33 @@
         {
             "name": "CtsInstantAppTests",
             "file_patterns": ["(/|^)InstantAppResolve[^/]*"]
+        },
+        {
+            "name": "CtsAutoFillServiceTestCases",
+            "options": [
+                {
+                    "include-filter": "android.autofillservice.cts.PreSimpleSaveActivityTest"
+                },
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                }
+            ],
+            "file_patterns": ["(/|^)Activity.java"]
+        },
+        {
+            "name": "CtsAutoFillServiceTestCases",
+            "options": [
+                {
+                    "include-filter": "android.autofillservice.cts.SimpleSaveActivityTest"
+                },
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                },
+                {
+                    "exclude-annotation": "android.platform.test.annotations.AppModeFull"
+                }
+            ],
+            "file_patterns": ["(/|^)Activity.java"]
         }
     ],
     "postsubmit": [