Merge "Vts: thermal: Test notification with an unregistered local callback" am: 101c9db566 am: 80284f9153 am: 37b696597a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1811717
Change-Id: Ic651c41e20a62e7a75bad9774daf7f71da3abf28
diff --git a/thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp b/thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp
index 2ee91f4..c7bab5c 100644
--- a/thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp
+++ b/thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp
@@ -103,12 +103,11 @@
// Test ThermalChangedCallback::notifyThrottling().
// This just calls into and back from our local ThermalChangedCallback impl.
-// Note: a real thermal throttling event from the Thermal HAL could be
-// inadvertently received here.
TEST_P(ThermalHidlTest, NotifyThrottlingTest) {
- auto ret = mThermalCallback->notifyThrottling(kThrottleTemp);
+ sp<ThermalCallback> thermalCallback = new (std::nothrow) ThermalCallback();
+ auto ret = thermalCallback->notifyThrottling(kThrottleTemp);
ASSERT_TRUE(ret.isOk());
- auto res = mThermalCallback->WaitForCallback(kCallbackNameNotifyThrottling);
+ auto res = thermalCallback->WaitForCallback(kCallbackNameNotifyThrottling);
EXPECT_TRUE(res.no_timeout);
ASSERT_TRUE(res.args);
EXPECT_EQ(kThrottleTemp, res.args->temperature);