| commit | 6d2c65c2d339e92a0e24f6a8bc4afce409de28e1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Jun 26 03:38:25 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 26 03:38:25 2024 +0000 |
| tree | 0fb679a1908d0debf5e9b46f0e4c8016a5e4a0a0 | |
| parent | 4a6853d456be50c39fc8c2ef8c0697d4d0edc423 [diff] | |
| parent | 3c903be55ded8a169174ff78b9d89638c95a3428 [diff] |
Merge "libaudiohal: do not erase port configs if resetting fails" into main am: 3c903be55d Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3125167 Change-Id: Ie6c16cbf6267e602c28652646903c3ad9675a903 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;