commit 3d294e73340ccc9acbd9753942d4b6ff75d1b1ac
author John Reck <jreck@google.com> Fri Sep 21 20:26:48 2018 +0000
committer John Reck <jreck@google.com> Fri Sep 21 20:44:31 2018 +0000
tree 9c16f882d39d56ef8743d7dd58dc1068313daec8
parent 337db2dc3e6746c404175243596e6388ba0974fb

Revert "Move AM/WM unit tests out of FrameworksServicesTests to WmTests"

This reverts commit 337db2dc3e6746c404175243596e6388ba0974fb.

Reason for revert: It's broken as treehugger repeatedly verified. The bypass of treehugger was wrong.

Bug: 116322473

Change-Id: I773606dcbd6825b0652d60b66fa4394a75ff7609

services/core/java/com/android/server/policy/TEST_MAPPING

diff --git a/services/core/java/com/android/server/policy/TEST_MAPPING b/services/core/java/com/android/server/policy/TEST_MAPPING
index 50c81f5..e212b04 100644
--- a/services/core/java/com/android/server/policy/TEST_MAPPING
+++ b/services/core/java/com/android/server/policy/TEST_MAPPING
@@ -1,6 +1,20 @@
 {
   "presubmit": [
     {
+      "name": "FrameworksServicesTests",
+      "options": [
+        {
+          "include-filter": "com.android.server.policy."
+        },
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "android.support.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
       "name": "WmTests",
       "options": [
         {
@@ -17,6 +31,14 @@
   ],
   "postsubmit": [
     {
+      "name": "FrameworksServicesTests",
+      "options": [
+        {
+          "include-filter": "com.android.server.policy."
+        }
+      ]
+    },
+    {
       "name": "WmTests",
       "options": [
         {