commit 627e0700655b6e8e2ad1739e51be45ce30e73501
author Eric Laurent <elaurent@google.com> Mon Nov 25 14:40:10 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 25 14:40:10 2024 +0000
tree f957533abdd6da261af338e128d110d189f1dc7a
parent 2da58decd3db2eade8ed8850b7a1d366b72a5f83
parent b5147053c5cb802ccddce73fd4d2089be6ecc4fd

Merge "Remove old asserts that don't compile with NDEBUG" into main am: b5147053c5

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

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

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index c45405b..1c350d5 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -8530,7 +8530,6 @@
                     }
                     if (invalidate) {
                         activeTrack->invalidate();
-                        ALOG_ASSERT(fastTrackToRemove == 0);
                         fastTrackToRemove = activeTrack;
                         removeTrack_l(activeTrack);
                         mActiveTracks.remove(activeTrack);