commit 6591a0760b06ee8fea3c9722dbd60800b753d76e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 06 02:09:42 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 06 02:09:42 2024 +0000
tree 87e782f2b9baa0ad380ef45999ce5b8de086356d
parent 51016462eafd09a1dec0dc7b8ee5de3eea9c7f89
parent 870b5a585814e4c650fea1027534d2fc06577257

Merge "Align the default value WIFI_COEX_NO_POWER_CAP" into main

automotive/can/1.0/default/CanBus.h

diff --git a/automotive/can/1.0/default/CanBus.h b/automotive/can/1.0/default/CanBus.h
index 8b73258..977bfcc 100644
--- a/automotive/can/1.0/default/CanBus.h
+++ b/automotive/can/1.0/default/CanBus.h
@@ -24,6 +24,7 @@
 #include <utils/Mutex.h>
 
 #include <atomic>
+#include <mutex>
 #include <thread>
 
 namespace android::hardware::automotive::can::V1_0::implementation {

thermal/aidl/vts/VtsHalThermalTargetTest.cpp

diff --git a/thermal/aidl/vts/VtsHalThermalTargetTest.cpp b/thermal/aidl/vts/VtsHalThermalTargetTest.cpp
index d36d986..7f33e2d 100644
--- a/thermal/aidl/vts/VtsHalThermalTargetTest.cpp
+++ b/thermal/aidl/vts/VtsHalThermalTargetTest.cpp
@@ -352,8 +352,8 @@
 // @VsrTest = VSR-3.2.5-002
 TEST_P(ThermalAidlTest, SkinTemperatureThresholdsTest) {
     auto apiLevel = ::android::base::GetIntProperty<int32_t>("ro.vendor.api_level", 0);
-    if (apiLevel < 35) {
-        GTEST_SKIP() << "Skipping test as the vendor level is below 35: " << apiLevel;
+    if (apiLevel < 202404) {
+        GTEST_SKIP() << "Skipping test as the vendor level is below 202404: " << apiLevel;
     }
     for (const auto& feature : kNonHandheldFeatures) {
         if (::testing::deviceSupportsFeature(feature.c_str())) {