commit 412c80fc7e8db8980e2470fb84404caf5305f9bf
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 22 00:39:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 22 00:39:19 2023 +0000
tree 661d27adedb3db2ea55d1a4027d5bd72ee67a94f
parent a2cfe84cedaf0b8c213ce39dd77eae313247e05c
parent 1e99626560ea16117266521e39dc4f407904309a

Merge "Clamp AIDL stream latency to [1, 3000] ms" into main am: 577aa3654e am: d209476077 am: e6affce8e6 am: 6538d1449a am: 1e99626560

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2719514

Change-Id: I44c73f3a36ec60d267fa1a7bf3583fb2c9843779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libaudiohal/impl/StreamHalAidl.cpp

diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp
index 80e19a0..f9aea37 100644
--- a/media/libaudiohal/impl/StreamHalAidl.cpp
+++ b/media/libaudiohal/impl/StreamHalAidl.cpp
@@ -267,7 +267,11 @@
     if (status_t status = updateCountersIfNeeded(&reply); status != OK) {
         return status;
     }
-    *latency = std::max<int32_t>(0, reply.latencyMs);
+
+    *latency = std::clamp(std::max<int32_t>(0, reply.latencyMs), 1, 3000);
+    ALOGW_IF(reply.latencyMs != static_cast<int32_t>(*latency),
+             "Suspicious latency value reported by HAL: %d, clamped to %u", reply.latencyMs,
+             *latency);
     return OK;
 }