From 55b588b13bf639d28f1ec18511f12160a8d0c620 Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Thu, 30 Jan 2020 09:20:57 -0800
Subject: [PATCH] Add UsageStats CTS tests to AppStandbyController test
 mapping.

Some UsageStats tests directly test AppStandbyController behavior and
other tests are affected by changes in AppStandbyController. Adding the
UsageStats CTS tests to AppStandbyController's pre and post-submit test
suite should help make sure there are no regressions when we make
changes.

Bug: 146453470
Test: cd into directory and run `atest`
Change-Id: If2109a0a49b1a32460fde965288363e20792c7e1
---
 .../service/java/com/android/server/usage/TEST_MAPPING | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 cf70878b88995..ba7572a5fb446 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
+++ b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
@@ -1,5 +1,12 @@
 {
   "presubmit": [
+    {
+      "name": "CtsUsageStatsTestCases",
+      "options": [
+        {"include-filter": "android.app.usage.cts.UsageStatsTest"},
+        {"exclude-annotation": "androidx.test.filters.FlakyTest"}
+      ]
+    },
     {
       "name": "FrameworksServicesTests",
       "options": [
@@ -9,6 +16,9 @@
     }
   ],
   "postsubmit": [
+    {
+      "name": "CtsUsageStatsTestCases"
+    },
     {
       "name": "FrameworksServicesTests",
       "options": [