commit 355ad01a9caa856c63cdb8d93b967c3d26b918a7
author Andy Hung <hunga@google.com> Tue Feb 01 01:43:10 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 01 01:43:10 2022 +0000
tree 16550bb1b853e25efc3706561ea324bfe40a4ab6
parent ef71e2915b754248f97280334ba329c20b8a1fd6
parent 5c4dd0d1a89041fe5408aca5cd168353c097c3c5

Merge "AudioFlinger: update error handling moveEffectChain_l"

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 733fea4..148cfa6 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -4121,6 +4121,8 @@
     size_t restored = 0;
     if (status != NO_ERROR) {
         for (const auto& effect : removed) {
+            dstThread->removeEffect_l(effect); // Note: Depending on error location, the last
+                                               // effect may not have been placed on dstThread.
             if (srcThread->addEffect_l(effect) == NO_ERROR) {
                 ++restored;
             }