From d4fd3235109ce4a72f3758013fe89685ed641ba8 Mon Sep 17 00:00:00 2001
From: Chun-Yi Lee <easoncylee@google.com>
Date: Mon, 13 Jan 2025 23:31:49 -0800
Subject: Revert "Update test mapping for all headroom tests"

This reverts commit 4b9716c8de14e55de48ca31a71ce82b1e381388d.

Reason for revert: b/389839447

Change-Id: I1d32be0266fe88c20a63b6acf5f3f0b6fbfae4b6
---
 core/java/android/os/TEST_MAPPING                  | 26 ----------------------
 native/android/TEST_MAPPING                        | 16 -------------
 .../com/android/server/power/hint/TEST_MAPPING     | 17 --------------
 3 files changed, 59 deletions(-)

diff --git a/core/java/android/os/TEST_MAPPING b/core/java/android/os/TEST_MAPPING
index 48fa0c8277df..effe5554aff4 100644
--- a/core/java/android/os/TEST_MAPPING
+++ b/core/java/android/os/TEST_MAPPING
@@ -112,32 +112,6 @@
     {
       "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 67226b733812..be84574e6a2c 100644
--- a/native/android/TEST_MAPPING
+++ b/native/android/TEST_MAPPING
@@ -26,22 +26,6 @@
     {
       "name": "NativeThermalUnitTestCases",
        "file_patterns": ["thermal.cpp"]
-    },
-    {
-       "file_patterns": ["system_health.cpp"],
-       "name": "NativeSystemHealthUnitTestCases",
-       "options": [
-          {"exclude-annotation": "androidx.test.filters.FlakyTest"},
-          {"exclude-annotation": "org.junit.Ignore"}
-        ]
-    },
-    {
-      "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 fd81277e9ba4..545070050977 100644
--- a/services/core/java/com/android/server/power/hint/TEST_MAPPING
+++ b/services/core/java/com/android/server/power/hint/TEST_MAPPING
@@ -15,22 +15,5 @@
         {"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
-- 
cgit v1.2.3-59-g8ed1b