Revert^2 "Update test mapping for all headroom tests"

This reverts commit d4fd3235109ce4a72f3758013fe89685ed641ba8.

Reason for revert: reland

Change-Id: I4e185f6ef1afd874273d1aea1240b3ae3fb79638

3 files changed, 58 insertions, 3 deletions

diff --git a/core/java/android/os/TEST_MAPPING b/core/java/android/os/TEST_MAPPING
index effe5554aff4..48fa0c8277df 100644
--- a/core/java/android/os/TEST_MAPPING
+++ b/core/java/android/os/TEST_MAPPING
@@ -112,6 +112,32 @@
     {
       "file_patterns": ["Bugreport[^/]*\\.java"],
       "name": "ShellTests"
+    },
+    {
+      "file_patterns": [
+        "CpuHeadroom[^/]*",
+        "GpuHeadroom[^/]*",
+        "health/SystemHealthManager\\.java"
+      ],
+      "name": "CtsOsTestCases",
+      "options": [
+        {"include-filter": "android.os.health.cts.HeadroomTest"},
+        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
+        {"exclude-annotation": "org.junit.Ignore"}
+      ]
+    },
+    {
+      "file_patterns": [
+        "CpuHeadroom[^/]*",
+        "GpuHeadroom[^/]*",
+        "health/SystemHealthManager\\.java"
+      ],
+      "name": "FrameworksCoreTests",
+      "options": [
+        {"include-filter": "android.os.SystemHealthManagerUnitTest"},
+        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
+        {"exclude-annotation": "org.junit.Ignore"}
+      ]
     }
   ],
   "ravenwood-presubmit": [
diff --git a/native/android/TEST_MAPPING b/native/android/TEST_MAPPING
index be84574e6a2c..456c719effc0 100644
--- a/native/android/TEST_MAPPING
+++ b/native/android/TEST_MAPPING
@@ -16,9 +16,7 @@
     {
        "name": "CtsOsTestCases_cts_performancehintmanagertest",
        "file_patterns": ["performance_hint.cpp"]
-    }
-  ],
-  "postsubmit": [
+    },
     {
       "name": "CtsThermalTestCases",
        "file_patterns": ["thermal.cpp"]
@@ -27,5 +25,19 @@
       "name": "NativeThermalUnitTestCases",
        "file_patterns": ["thermal.cpp"]
     }
+  ],
+  "postsubmit": [
+    {
+       "file_patterns": ["system_health.cpp"],
+       "name": "NativeSystemHealthUnitTestCases"
+    },
+    {
+      "file_patterns": ["system_health.cpp"],
+      "name": "CtsSystemHealthTestCases",
+      "options": [
+        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
+        {"exclude-annotation": "org.junit.Ignore"}
+      ]
+    }
   ]
 }
diff --git a/services/core/java/com/android/server/power/hint/TEST_MAPPING b/services/core/java/com/android/server/power/hint/TEST_MAPPING
index 545070050977..fd81277e9ba4 100644
--- a/services/core/java/com/android/server/power/hint/TEST_MAPPING
+++ b/services/core/java/com/android/server/power/hint/TEST_MAPPING
@@ -15,5 +15,22 @@
         {"exclude-annotation": "org.junit.Ignore"}
       ]
     }
+  ],
+  "postsubmit": [
+    {
+      "name": "CtsSystemHealthTestCases",
+      "options": [
+        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
+        {"exclude-annotation": "org.junit.Ignore"}
+      ]
+    },
+    {
+      "name": "CtsOsTestCases",
+      "options": [
+        {"include-filter": "android.os.health.cts.HeadroomTest"},
+        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
+        {"exclude-annotation": "org.junit.Ignore"}
+      ]
+    }
   ]
 }
\ No newline at end of file