Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b396572 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "libaudiohal: do not erase port configs if resetting fails" into main am: 3c903be5 am: 6d2c65c2

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



Change-Id: I315ce952a87ed9f782bd7c958937853781cc6404
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7e7e662 6d2c65c2

media/libaudiohal/impl/Hal2AidlMapper.cpp

+1 −0
Original line number Diff line number Diff line
@@ -929,6 +929,7 @@ void Hal2AidlMapper::resetPortConfig(int32_t portConfigId) { 
                !status.isOk()) {

            ALOGE("%s: error while resetting port config %d: %s",

                    __func__, portConfigId, status.getDescription().c_str());

            return;

        }

        mPortConfigs.erase(it);

        return;