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

Commit 0afa5afb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash in audiosystem_tests" am: cada19c0 

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



Change-Id: Idf55d9ff7eabef6bcd8093982891d4f1669c822e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50b583ba cada19c0

media/libaudioclient/tests/audiosystem_tests.cpp

+8 −2
Original line number Diff line number Diff line
@@ -49,12 +49,18 @@ class AudioSystemTest : public ::testing::Test { 
    void TearDown() override {

        if (mPlayback) {

            mPlayback->stop();

            mPlayback->getAudioTrackHandle()->removeAudioDeviceCallback(mCbPlayback);

            if (auto handle = mPlayback->getAudioTrackHandle(); handle) {

                handle->removeAudioDeviceCallback(mCbPlayback);

            }

            mCbPlayback.clear();

            mPlayback.clear();

        }

        if (mCapture) {

            mCapture->stop();

            mCapture->getAudioRecordHandle()->removeAudioDeviceCallback(mCbRecord);

            if (auto handle = mCapture->getAudioRecordHandle(); handle) {

                handle->removeAudioDeviceCallback(mCbRecord);

            }

            mCbRecord.clear();

            mCapture.clear();

        }

    }