diff options
author | Xin Li <delphij@google.com> | 2023-03-13 23:11:17 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2023-03-13 23:11:17 -0700 |
commit | 90d54442335ecd83782489b70a3352e746ed9238 (patch) | |
tree | 6f68d0ce73ef9a0546cdede39cff8a15364861fe | |
parent | 442dc965cc24a526b9cd893f50a7493b0bb51b0d (diff) | |
parent | 583fab58117f976165a1793fde08db2db65b33d3 (diff) | |
download | libhardware-90d54442335ecd83782489b70a3352e746ed9238.tar.gz |
Merge Android 13 QPR2
Bug: 273316506
Merged-In: I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2
Change-Id: Id186d8c8323c8783c479ce1c16941a674824cff4
-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; |