diff options
| author | Xin Li <delphij@google.com> | 2023-01-11 22:47:14 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-01-11 22:47:14 -0800 |
| commit | bae8fdfc801505905b139f2baf8621f7fc8df809 (patch) | |
| tree | 50e67f1d44f274837279cffe5b40da3dc6537d4f | |
| parent | 3f31ee2d2ac292b2efc55ef9b41e1a15784b74da (diff) | |
| parent | caeb590d0af0828f3b3825533bce5b205bccea65 (diff) | |
| download | libhardware-bae8fdfc801505905b139f2baf8621f7fc8df809.tar.gz | |
Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2
Change-Id: I7a5fa42c0aea354cd0320887df4f907d2c71cdaa
| -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; |