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