diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-08-30 22:17:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-08-30 22:17:56 +0000 |
| commit | 4da29523423865cfcf97c6ace735f0c410f46517 (patch) | |
| tree | c42aaafb45da39a7911ac3915329084d9beac7cb | |
| parent | db496480aed25211e33725b18f34a5a76a0599b6 (diff) | |
| parent | 686504cdf0f4665c37521ac724d219d9e7a77b1b (diff) | |
| download | base-4da29523423865cfcf97c6ace735f0c410f46517.tar.gz | |
Merge "[DO NOT MERGE] Include exclude-rules in all TEST_MAPPING config instances." into stage-aosp-master
| -rw-r--r-- | services/accessibility/TEST_MAPPING | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/TEST_MAPPING | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/services/accessibility/TEST_MAPPING b/services/accessibility/TEST_MAPPING index d90c3bd9b4c2..45c52452afb4 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 21d4925722d0..2c2013c89bab 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" } ] }, |