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
diff --git a/services/core/java/com/android/server/wm/TEST_MAPPING b/services/core/java/com/android/server/wm/TEST_MAPPING
index 30d84fb..0c9a14b 100644
--- a/services/core/java/com/android/server/wm/TEST_MAPPING
+++ b/services/core/java/com/android/server/wm/TEST_MAPPING
@@ -12,6 +12,20 @@
]
},
{
+ "name": "FrameworksServicesTests",
+ "options": [
+ {
+ "include-filter": "com.android.server.wm."
+ },
+ {
+ "include-annotation": "android.platform.test.annotations.Presubmit"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ },
+ {
"name": "WmTests",
"options": [
{
@@ -31,6 +45,14 @@
"name": "CtsWindowManagerDeviceTestCases"
},
{
+ "name": "FrameworksServicesTests",
+ "options": [
+ {
+ "include-filter": "com.android.server.wm."
+ }
+ ]
+ },
+ {
"name": "WmTests",
"options": [
{