Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
Increase dynamic sensor op timeout to 1.6 sec
Change-Id: Ie78cdab124100a08f05435cfd754ad3b41bf8887
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;