Merge 8348f238c3a157a635cbbf913e80c93496be3f9b on remote branch

Change-Id: I034c3c67a794d4d26a8ff62cfa5b6e26f4e4d029

1 files changed, 4 insertions, 3 deletions

diff --git a/modules/sensors/dynamic_sensor/DynamicSensorManager.h b/modules/sensors/dynamic_sensor/DynamicSensorManager.h
index e5ab2b43..7b487d52 100644
--- a/modules/sensors/dynamic_sensor/DynamicSensorManager.h
+++ b/modules/sensors/dynamic_sensor/DynamicSensorManager.h
@@ -125,9 +125,10 @@ private:
     // daemons
     std::vector<sp<BaseDynamicSensorDaemon>> mDaemonVector;
 
-    // Sensor operation queue. Calls to the sensor HAL must complete within 1
-    // second.
-    std::chrono::milliseconds kSensorOpTimeout = std::chrono::milliseconds(900);
+    // 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.
+    std::chrono::milliseconds kSensorOpTimeout = std::chrono::milliseconds(1600);
     std::mutex mSensorOpQueueLock;
     std::queue<std::pair<uint64_t, std::shared_future<int>>> mSensorOpQueue;
     uint64_t mNextSensorOpIndex = 0;