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

Commit 3dbe932f authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "audio: Address comments from an internal review" into main am:... 

Merge "audio: Address comments from an internal review" into main am: 09d45c47 am: 581cd68e am: ca31f56b

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



Change-Id: Ib7f0bc5adf57e63dd1065f5b20a5fa3dcf56d4b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6184c50 ca31f56b

audio/aidl/default/StreamSwitcher.cpp

+7 −4
Original line number Diff line number Diff line
@@ -126,11 +126,10 @@ ndk::ScopedAStatus StreamSwitcher::removeEffect(const std::shared_ptr<IEffect>& 
        LOG(ERROR) << __func__ << ": stream was closed";

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

    }

    for (auto it = mEffects.begin(); it != mEffects.end();) {

    for (auto it = mEffects.begin(); it != mEffects.end(); ++it) {

        if ((*it)->asBinder() == in_effect->asBinder()) {

            it = mEffects.erase(it);

        } else {

            ++it;

            mEffects.erase(it);

            break;

        }

    }

    return !mIsStubStream ? mStream->removeEffect(in_effect) : ndk::ScopedAStatus::ok();
@@ -201,6 +200,10 @@ ndk::ScopedAStatus StreamSwitcher::setConnectedDevices(const std::vector<AudioDe 
        }

        // The delegate is null because StreamSwitcher handles IStreamCommon methods by itself.

        if (ndk::ScopedAStatus status = mStream->initInstance(nullptr); !status.isOk()) {

            if (mIsStubStream) {

                LOG(FATAL) << __func__

                           << ": failed to initialize stub stream: " << status.getDescription();

            }

            // Need to close the current failed stream, and report an error.

            // Since we can't operate without a stream implementation, put a stub in.

            RETURN_STATUS_IF_ERROR(closeCurrentStream(false /*validateStreamState*/));

audio/aidl/default/alsa/Mixer.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class Mixer { 
    std::mutex mMixerAccess;

    // The mixer object is owned by ALSA and will be released when the mixer is closed.

    struct mixer* const mMixer;

    // `mMixerControls` will only be initialized in constructor. After that, it wil only be

    // `mMixerControls` will only be initialized in constructor. After that, it will only be

    // read but not be modified. Each mixer_ctl object is owned by ALSA, it's life span is

    // the same as of the mixer itself.

    const Controls mMixerControls;

audio/aidl/default/include/core-impl/StreamSwitcher.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


namespace aidl::android::hardware::audio::core {



// 'StreamSwitcher' is implementation of 'StreamCommonInterface' which allows

// 'StreamSwitcher' is an implementation of 'StreamCommonInterface' which allows

// dynamically switching the underlying stream implementation based on currently

// connected devices. This is achieved by replacing inheritance from

// 'StreamCommonImpl' with owning an instance of it. StreamSwitcher must be