commit d497c878287ada4d310dea12bcd297f889099761
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 10 00:21:19 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 10 00:21:19 2023 +0000
tree aeb5afde87276dfe31efa3b0644672675c1bf8e1
parent 8220eb4ee90774c7af1c56bed82a61625a7a657e
parent 9a056455f2218695f8fce5f25f8374916229656e

Snap for 9470583 from 9a056455f2218695f8fce5f25f8374916229656e to tm-qpr3-release

Change-Id: I55c144b58c4ba7256447b3c4491f3dc05b43924f

modules/sensors/dynamic_sensor/DynamicSensorManager.h

diff --git a/modules/sensors/dynamic_sensor/DynamicSensorManager.h b/modules/sensors/dynamic_sensor/DynamicSensorManager.h
index b8a7320..2cae120 100644
--- a/modules/sensors/dynamic_sensor/DynamicSensorManager.h
+++ b/modules/sensors/dynamic_sensor/DynamicSensorManager.h
@@ -125,10 +125,11 @@
     // 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;