diff options
author | Andy Quan <andyq@google.com> | 2023-02-16 14:15:10 -0800 |
---|---|---|
committer | Andy Quan <andyq@google.com> | 2023-02-16 14:15:10 -0800 |
commit | f264b45b30c2ec9be5ef2940b8d37a48e3b4b3ad (patch) | |
tree | aeb5afde87276dfe31efa3b0644672675c1bf8e1 | |
parent | d38c4322f9a2c9ac089944788ab3497c95bbae48 (diff) | |
parent | ad41bb504981fde6678d17750fecff522020d3a4 (diff) | |
download | libhardware-f264b45b30c2ec9be5ef2940b8d37a48e3b4b3ad.tar.gz |
DO NOT MERGE - Merge tm-qpr2-release into tm-platform-merge
Bug: 269346300
Change-Id: I3d4c7d3f87b05d7e3e4520f1b1402624dc742ee2
-rw-r--r-- | modules/sensors/dynamic_sensor/DynamicSensorManager.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/sensors/dynamic_sensor/DynamicSensorManager.h b/modules/sensors/dynamic_sensor/DynamicSensorManager.h index b8a73203..2cae1208 100644 --- a/modules/sensors/dynamic_sensor/DynamicSensorManager.h +++ b/modules/sensors/dynamic_sensor/DynamicSensorManager.h @@ -125,10 +125,11 @@ private: // daemons std::vector<sp<BaseDynamicSensorDaemon>> mDaemonVector; - // Sensor operation queue. Calls to the sensor HAL must complete within 1 - // second. + // Sensor operation queue. Calls to the sensor HAL should complete within ~1 + // second, but to permit delayed replies due to sniff mode, etc., we use a + // slightly longer timeout here. static constexpr std::chrono::milliseconds - kSensorOpTimeout = std::chrono::milliseconds(900); + kSensorOpTimeout = std::chrono::milliseconds(1600); std::mutex mSensorOpQueueLock; std::queue<std::pair<uint64_t, std::shared_future<int>>> mSensorOpQueue; uint64_t mNextSensorOpIndex = 0; |