From 38e65b13d68bbab821048e0796ddf66f4208bc7e Mon Sep 17 00:00:00 2001 From: Tyler Trephan Date: Tue, 25 Jan 2022 23:04:55 +0000 Subject: [PATCH] Updated VTS to support limited axes IMU sensors. Test: atest VtsAidlHalSensorsTargetTest Bug: 188012758 Change-Id: If0a2051eb0d39d8afdf7011da1371a48e4b12c44 --- sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp b/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp index 1bc7263048..105cb97eda 100644 --- a/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp +++ b/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp @@ -60,6 +60,8 @@ static void assertTypeMatchStringType(SensorType type, const std::string& string ASSERT_STREQ(SENSOR_STRING_TYPE_##type, stringType.c_str()); \ break; CHECK_TYPE_STRING_FOR_SENSOR_TYPE(ACCELEROMETER); + CHECK_TYPE_STRING_FOR_SENSOR_TYPE(ACCELEROMETER_LIMITED_AXES); + CHECK_TYPE_STRING_FOR_SENSOR_TYPE(ACCELEROMETER_LIMITED_AXES_UNCALIBRATED); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(ACCELEROMETER_UNCALIBRATED); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(ADDITIONAL_INFO); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(AMBIENT_TEMPERATURE); @@ -70,6 +72,8 @@ static void assertTypeMatchStringType(SensorType type, const std::string& string CHECK_TYPE_STRING_FOR_SENSOR_TYPE(GLANCE_GESTURE); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(GRAVITY); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(GYROSCOPE); + CHECK_TYPE_STRING_FOR_SENSOR_TYPE(GYROSCOPE_LIMITED_AXES); + CHECK_TYPE_STRING_FOR_SENSOR_TYPE(GYROSCOPE_LIMITED_AXES_UNCALIBRATED); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(GYROSCOPE_UNCALIBRATED); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(HEART_BEAT); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(HEART_RATE); @@ -122,8 +126,11 @@ bool isDirectReportRateSupported(SensorInfo sensor, ISensors::RateLevel rate) { int expectedReportModeForType(SensorType type) { switch (type) { case SensorType::ACCELEROMETER: + case SensorType::ACCELEROMETER_LIMITED_AXES: case SensorType::ACCELEROMETER_UNCALIBRATED: + case SensorType::ACCELEROMETER_LIMITED_AXES_UNCALIBRATED: case SensorType::GYROSCOPE: + case SensorType::GYROSCOPE_LIMITED_AXES: case SensorType::MAGNETIC_FIELD: case SensorType::ORIENTATION: case SensorType::PRESSURE: @@ -133,6 +140,7 @@ int expectedReportModeForType(SensorType type) { case SensorType::MAGNETIC_FIELD_UNCALIBRATED: case SensorType::GAME_ROTATION_VECTOR: case SensorType::GYROSCOPE_UNCALIBRATED: + case SensorType::GYROSCOPE_LIMITED_AXES_UNCALIBRATED: case SensorType::GEOMAGNETIC_ROTATION_VECTOR: case SensorType::POSE_6DOF: case SensorType::HEART_BEAT: