diff options
Diffstat (limited to 'sensors')
| -rw-r--r-- | sensors/1.0/Android.bp | 2 | ||||
| -rw-r--r-- | sensors/1.0/default/Sensors.h | 1 | ||||
| -rw-r--r-- | sensors/1.0/default/convert.cpp | 4 | ||||
| -rw-r--r-- | sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp index 17bd4c872..f6cf4a7a1 100644 --- a/sensors/1.0/Android.bp +++ b/sensors/1.0/Android.bp @@ -53,13 +53,11 @@ cc_library_shared { "liblog", "libutils", "libcutils", - "android.hidl.base@1.0", ], export_shared_lib_headers: [ "libhidlbase", "libhidltransport", "libhwbinder", "libutils", - "android.hidl.base@1.0", ], } diff --git a/sensors/1.0/default/Sensors.h b/sensors/1.0/default/Sensors.h index 7d715e0f6..be00a9610 100644 --- a/sensors/1.0/default/Sensors.h +++ b/sensors/1.0/default/Sensors.h @@ -18,6 +18,7 @@ #define HARDWARE_INTERFACES_SENSORS_V1_0_DEFAULT_SENSORS_H_ +#include <android-base/macros.h> #include <android/hardware/sensors/1.0/ISensors.h> #include <hardware/sensors.h> #include <mutex> diff --git a/sensors/1.0/default/convert.cpp b/sensors/1.0/default/convert.cpp index 047374f9e..a5747d42f 100644 --- a/sensors/1.0/default/convert.cpp +++ b/sensors/1.0/default/convert.cpp @@ -376,6 +376,10 @@ bool convertFromSharedMemInfo(const SharedMemInfo& memIn, sensors_direct_mem_t * return false; } + if (memIn.memoryHandle == nullptr) { + return false; + } + memOut->size = memIn.size; memOut->handle = memIn.memoryHandle; return true; diff --git a/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp b/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp index a6f6852a8..98b4994ab 100644 --- a/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp +++ b/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp @@ -543,7 +543,7 @@ class SensorsHidlTest : public ::testing::VtsHalHidlTargetTestBase { }; const Vec3NormChecker SensorsHidlTest::sAccelNormChecker( - Vec3NormChecker::byNominal(GRAVITY_EARTH, 0.5f/*m/s^2*/)); + Vec3NormChecker::byNominal(GRAVITY_EARTH, 1.0f/*m/s^2*/)); const Vec3NormChecker SensorsHidlTest::sGyroNormChecker( Vec3NormChecker::byNominal(0.f, 0.1f/*rad/s*/)); @@ -1327,9 +1327,7 @@ void SensorsHidlTest::testDirectReportOperation( // stop sensor and unregister channel configDirectReport(sensor.sensorHandle, channelHandle, RateLevel::STOP, - [&eventToken] (auto result, auto) { - EXPECT_EQ(result, Result::OK); - }); + [](auto result, auto) { EXPECT_EQ(result, Result::OK); }); EXPECT_EQ(unregisterDirectChannel(channelHandle), Result::OK); } |