Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't assert while a callback is registered" am: 6a022ad1c4 am: d5e4905caa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1654108

Change-Id: I1635b058ca73c9c7d833c328e2caf59e715fcabe
This commit is contained in:
Anthony Stange
2021-03-25 21:14:10 +00:00
committed by Automerger Merge Worker
parent b210d975c5 d5e4905caa
commit 8a673bc15e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h
View File

@@ -462,6 +462,7 @@ TEST_P(SensorsHidlTest, InjectSensorEventData) {
// Wait for events to be written back to the Event FMQ // Wait for events to be written back to the Event FMQ
callback.waitForEvents(sensors, milliseconds(1000) /* timeout */); callback.waitForEvents(sensors, milliseconds(1000) /* timeout */);
getEnvironment()->unregisterCallback();
for (const auto& s : sensors) { for (const auto& s : sensors) {
auto events = callback.getEvents(s.sensorHandle); auto events = callback.getEvents(s.sensorHandle);
@@ -485,7 +486,6 @@ TEST_P(SensorsHidlTest, InjectSensorEventData) {
ASSERT_EQ(lastEvent.u.vec3.status, injectedEvent.u.vec3.status); ASSERT_EQ(lastEvent.u.vec3.status, injectedEvent.u.vec3.status);
} }
getEnvironment()->unregisterCallback();
ASSERT_EQ(Result::OK, getSensors()->setOperationMode(OperationMode::NORMAL)); ASSERT_EQ(Result::OK, getSensors()->setOperationMode(OperationMode::NORMAL));
} }
@@ -603,7 +603,7 @@ void SensorsHidlTest::runFlushTest(const std::vector<SensorInfoType>& sensors, b
<< " type=" << static_cast<int>(sensor.type) << " name=" << sensor.name); << " type=" << static_cast<int>(sensor.type) << " name=" << sensor.name);
Result flushResult = flush(sensor.sensorHandle); Result flushResult = flush(sensor.sensorHandle);
ASSERT_EQ(flushResult, expectedResponse); EXPECT_EQ(flushResult, expectedResponse);
} }
} }