diff options
author | Xin Li <delphij@google.com> | 2023-03-14 21:40:43 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-14 21:40:43 +0000 |
commit | 728df4f5fc8217ac35e17ecfe84502d842902d20 (patch) | |
tree | 6f68d0ce73ef9a0546cdede39cff8a15364861fe | |
parent | 442dc965cc24a526b9cd893f50a7493b0bb51b0d (diff) | |
parent | 90d54442335ecd83782489b70a3352e746ed9238 (diff) | |
download | libhardware-728df4f5fc8217ac35e17ecfe84502d842902d20.tar.gz |
Merge "Merge Android 13 QPR2"android-u-beta-1-gpl
-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; |