| commit | 9e37c6fc49ca72d020cf0461fbe0112dd400d005 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 15 11:50:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 15 11:50:03 2023 +0000 |
| tree | af4a22324a012335821f33a17a29f0d06da05033 | |
| parent | c7bbbc4ac79051e8684f23c370f9025569546f64 [diff] | |
| parent | 98f296ec70776d5c00efe2688a8b6d2f7540d4b0 [diff] |
Merge "Fix AudioFlinger crash after playing overnight." into main am: 85ee025ddb am: 98f296ec70 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2827570 Change-Id: Iba3311c667c7f8e6707b56989891af211c579136 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 6ebc699..37d3e4e 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp
@@ -450,6 +450,10 @@ if (*_aidl_return != OK) { return Status::ok(); } + + // restrict position modulo INT_MAX to avoid integer sanitization abort + legacy.mPosition &= INT_MAX; + *timestamp = legacy2aidl_AudioTimestamp_AudioTimestampInternal(legacy).value(); return Status::ok(); }