commit 3c903be55ded8a169174ff78b9d89638c95a3428
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jun 26 03:18:16 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 26 03:18:16 2024 +0000
tree c33c7fbb4de7665451de62d1736461a979759c03
parent 027e8a3836d87289522f084224742de46b314a5b
parent d6a604e0b816130bb12afb4917454d0e9b773e59

Merge "libaudiohal: do not erase port configs if resetting fails" into main

media/libaudiohal/impl/Hal2AidlMapper.cpp

diff --git a/media/libaudiohal/impl/Hal2AidlMapper.cpp b/media/libaudiohal/impl/Hal2AidlMapper.cpp
index 052522f..a01ac4b 100644
--- a/media/libaudiohal/impl/Hal2AidlMapper.cpp
+++ b/media/libaudiohal/impl/Hal2AidlMapper.cpp
@@ -929,6 +929,7 @@
                 !status.isOk()) {
             ALOGE("%s: error while resetting port config %d: %s",
                     __func__, portConfigId, status.getDescription().c_str());
+            return;
         }
         mPortConfigs.erase(it);
         return;