From a287e9b578d9a59b3119e01c0d2ffcd97e8853a9 Mon Sep 17 00:00:00 2001
From: Xiang Wang <xwxw@google.com>
Date: Wed, 28 Aug 2024 17:40:57 -0700
Subject: Promote thermal tests to presubmit

Bug: 360486877
Flag: TEST_ONLY
Test: n/a
Change-Id: I89ec3bd306f26244d1db70077c854077c91646ea
---
 native/android/TEST_MAPPING                              |  4 +---
 services/core/java/com/android/server/power/TEST_MAPPING | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/native/android/TEST_MAPPING b/native/android/TEST_MAPPING
index be84574e6a2c..70560a84b88e 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"]
diff --git a/services/core/java/com/android/server/power/TEST_MAPPING b/services/core/java/com/android/server/power/TEST_MAPPING
index f67f56db3c1e..c5937e5ffb90 100644
--- a/services/core/java/com/android/server/power/TEST_MAPPING
+++ b/services/core/java/com/android/server/power/TEST_MAPPING
@@ -8,6 +8,12 @@
     },
     {
       "name": "PowerServiceTests_server_power"
+    },
+    {
+      "name": "CtsStatsdAtomHostTestCases_statsdatom_powermanager",
+      "file_patterns": [
+        "(/|^)ThermalManagerService.java"
+      ]
     }
   ],
   "postsubmit": [
@@ -22,12 +28,6 @@
     },
     {
       "name": "PowerServiceTests_server_power"
-    },
-    {
-      "name": "CtsStatsdAtomHostTestCases_statsdatom_powermanager",
-      "file_patterns": [
-        "(/|^)ThermalManagerService.java"
-      ]
     }
   ]
 }
-- 
cgit v1.2.3-59-g8ed1b