Merge Android 13 QPR2
Bug: 273316506
Merged-In: I5fb5b9ff37a6f8a245678c87ee82e2032dc845f2
Change-Id: Id186d8c8323c8783c479ce1c16941a674824cff4
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;