Merge "Snap for 9979206 from 728df4f5fc8217ac35e17ecfe84502d842902d20 to sdk-release" into sdk-releaseplatform-tools-34.0.3

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;