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

Commit 75859e98 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Automerger Merge Worker
Browse files

Merge "Revert "audio: update setAudioPatch"" into main am: 59126f94 am: 09b80bd5 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3391172



Change-Id: Ibc5e4836f63e9f7831f0e2901c83e3573238b3f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2cfe77fd 09b80bd5

audio/aidl/default/Module.cpp

+12 −21
Original line number Diff line number Diff line
@@ -1049,23 +1049,6 @@ ndk::ScopedAStatus Module::setAudioPatch(const AudioPatch& in_requested, AudioPa 
        return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);

    }



    auto& patches = getConfig().patches;

    auto existing = patches.end();

    if (in_requested.id != 0) {

        existing = findById<AudioPatch>(patches, in_requested.id);

        if (existing == patches.end()) {

            LOG(ERROR) << __func__ << ": " << mType << ": not found existing patch id "

                       << in_requested.id;

            return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);

        }

        if (in_requested == *existing) {

            LOG(INFO) << __func__ << ": " << mType

                      << ": requested patch has no changes compared to already existing one, id "

                      << in_requested.id;

            return ndk::ScopedAStatus::ok();

        }

    }



    auto& configs = getConfig().portConfigs;

    std::vector<int32_t> missingIds;

    auto sources =
@@ -1105,12 +1088,20 @@ ndk::ScopedAStatus Module::setAudioPatch(const AudioPatch& in_requested, AudioPa 
    }

    RETURN_STATUS_IF_ERROR(checkAudioPatchEndpointsMatch(sources, sinks));



    auto& patches = getConfig().patches;

    auto existing = patches.end();

    std::optional<decltype(mPatches)> patchesBackup;

    if (in_requested.id != 0) {

        existing = findById<AudioPatch>(patches, in_requested.id);

        if (existing != patches.end()) {

            patchesBackup = mPatches;

            cleanUpPatch(existing->id);

        } else {

            LOG(ERROR) << __func__ << ": " << mType << ": not found existing patch id "

                       << in_requested.id;

            return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);

        }

    }



    // Validate the requested patch.

    for (const auto& [sinkPortId, nonExclusive] : allowedSinkPorts) {

        if (!nonExclusive && mPatches.count(sinkPortId) != 0) {