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

Commit 06efc3a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AIDL: Add unit tests to external device disconnection" into main am:... 

Merge "AIDL: Add unit tests to external device disconnection" into main am: 67bf9d9f am: 457b3a1f

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



Change-Id: I7d3d878cf0fabc2e8373991bb59a2dfde64c5eb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f5ab14c 457b3a1f

media/libaudiohal/impl/Hal2AidlMapper.cpp

+8 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ status_t Hal2AidlMapper::findPortConfig(const AudioDevice& device, AudioPortConf 
        *portConfig = it->second;

        return OK;

    }

    ALOGE("%s: could not find a configured device port for device %s",

    ALOGE("%s: could not find a device port config for device %s",

            __func__, device.toString().c_str());

    return BAD_VALUE;

}
@@ -1020,6 +1020,13 @@ status_t Hal2AidlMapper::setDevicePortConnectedState(const AudioPort& devicePort 
                }

            }

            resetUnusedPortConfigs();

            // Patches created by Hal2AidlMapper during stream creation and not "claimed"

            // by the framework must not be surfaced to it.

            for (auto& s : mStreams) {

                if (auto it = releasedPatches.find(s.second.second); it != releasedPatches.end()) {

                    releasedPatches.erase(it);

                }

            }

            mFwkPatches.merge(releasedPatches);

            LOG_ALWAYS_FATAL_IF(!releasedPatches.empty(),

                    "mFwkPatches already contains some of released patches");

media/libaudiohal/tests/CoreAudioHalAidl_test.cpp

+564 −16

File changed.

Preview size limit exceeded, changes collapsed.