diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2023-07-04 20:04:45 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2023-07-04 20:04:45 +0800 |
| commit | e1390d22fae12df2784992b3ba238af8e90eaecc (patch) | |
| tree | 52dfbc4cd9931c722b210f063c144fe97a706af5 /sensors | |
| parent | b3f20c2aa61e4a6e07e8c06cf3623f1666620e1f (diff) | |
| parent | 7c8943fde12ec5fb0f9629746c65e8b1bc78d1b4 (diff) | |
Merge tag 'LA.QSSI.13.0.r1-10700-qssi.0' into tachibana-mr1tachibana-mr1
"LA.QSSI.13.0.r1-10700-qssi.0"
Change-Id: I11f0f2cb764e800ff1fd298c5a6443b98cf9a8a3
Diffstat (limited to 'sensors')
3 files changed, 7 insertions, 1 deletions
diff --git a/sensors/2.1/multihal/android.hardware.sensors@2.1-service-multihal.rc b/sensors/2.1/multihal/android.hardware.sensors@2.1-service-multihal.rc index f47e060f88..0b59841730 100644 --- a/sensors/2.1/multihal/android.hardware.sensors@2.1-service-multihal.rc +++ b/sensors/2.1/multihal/android.hardware.sensors@2.1-service-multihal.rc @@ -1,7 +1,7 @@ service vendor.sensors-hal-2-1-multihal /vendor/bin/hw/android.hardware.sensors@2.1-service.multihal class hal user system - group system wakelock context_hub + group system wakelock context_hub uhid task_profiles ServiceCapacityLow capabilities BLOCK_SUSPEND rlimit rtprio 10 10 diff --git a/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp b/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp index d536e290b2..35220a2d31 100644 --- a/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp +++ b/sensors/aidl/vts/VtsAidlHalSensorsTargetTest.cpp @@ -98,6 +98,7 @@ static void assertTypeMatchStringType(SensorType type, const std::string& string CHECK_TYPE_STRING_FOR_SENSOR_TYPE(TILT_DETECTOR); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(WAKE_GESTURE); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(WRIST_TILT_GESTURE); + CHECK_TYPE_STRING_FOR_SENSOR_TYPE(HINGE_ANGLE); default: FAIL() << "Type " << static_cast<int>(type) << " in android defined range is not checked, " diff --git a/sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h b/sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h index 7e22b1902f..aa6e8814a2 100644 --- a/sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h +++ b/sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h @@ -559,6 +559,11 @@ TEST_P(SensorsHidlTest, CallInitializeTwice) { } TEST_P(SensorsHidlTest, CleanupConnectionsOnInitialize) { + if (getSensorsList().size() == 0) { + // No sensors + return; + } + activateAllSensors(true); // Verify that events are received |