diff --git a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING index e407e3126058a..a6a3aafdb4f42 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING +++ b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING @@ -19,6 +19,18 @@ ] } ], + "presubmit-large": [ + { + "name": "CtsUsageStatsTestCases", + "options": [ + {"include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"}, + {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, + {"exclude-annotation": "androidx.test.filters.FlakyTest"}, + {"exclude-annotation": "androidx.test.filters.MediumTest"}, + {"exclude-annotation": "androidx.test.filters.LargeTest"} + ] + } + ], "postsubmit": [ { "name": "CtsUsageStatsTestCases" diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING index 03eddc9634d78..e4f624d4ac288 100644 --- a/services/core/java/com/android/server/am/TEST_MAPPING +++ b/services/core/java/com/android/server/am/TEST_MAPPING @@ -63,6 +63,32 @@ ] } ], + "presubmit-large": [ + { + "name": "CtsUsageStatsTestCases", + "file_patterns": [ + "ActivityManagerService\\.java", + "BroadcastQueue\\.java" + ], + "options": [ + { + "include-filter": "android.app.usage.cts.BroadcastResponseStatsTest" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" + }, + { + "exclude-annotation": "androidx.test.filters.MediumTest" + }, + { + "exclude-annotation": "androidx.test.filters.LargeTest" + } + ] + } + ], "postsubmit": [ { "name": "FrameworksServicesTests", diff --git a/services/usage/java/com/android/server/usage/TEST_MAPPING b/services/usage/java/com/android/server/usage/TEST_MAPPING index 523d5f95c6f30..1c0c71b65fd75 100644 --- a/services/usage/java/com/android/server/usage/TEST_MAPPING +++ b/services/usage/java/com/android/server/usage/TEST_MAPPING @@ -20,6 +20,28 @@ ] } ], + "presubmit-large": [ + { + "name": "CtsUsageStatsTestCases", + "options": [ + { + "include-filter": "android.app.usage.cts.BroadcastResponseStatsTest" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "android.platform.test.annotations.FlakyTest" + }, + { + "exclude-annotation": "androidx.test.filters.MediumTest" + }, + { + "exclude-annotation": "androidx.test.filters.LargeTest" + } + ] + } + ], "postsubmit": [ { "name": "CtsUsageStatsTestCases",