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

Commit d53dce49 authored by Xiao Huang's avatar Xiao Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when callback thread late launched after stream close." am: f0f2fcbe 

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



Change-Id: I79b5b42cb3dd64ae960e2fcfc47e6c523be0787e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 493331f2 f0f2fcbe

services/audioflinger/Threads.cpp

+8 −1
Original line number Diff line number Diff line
@@ -2909,7 +2909,14 @@ void AudioFlinger::PlaybackThread::onError() 
void AudioFlinger::PlaybackThread::onCodecFormatChanged(

        const std::basic_string<uint8_t>& metadataBs)

{

    std::thread([this, metadataBs]() {

    wp<AudioFlinger::PlaybackThread> weakPointerThis = this;

    std::thread([this, metadataBs, weakPointerThis]() {

            sp<AudioFlinger::PlaybackThread> playbackThread = weakPointerThis.promote();

            if (playbackThread == nullptr) {

                ALOGW("PlaybackThread was destroyed, skip codec format change event");

                return;

            }



            audio_utils::metadata::Data metadata =

                    audio_utils::metadata::dataFromByteString(metadataBs);

            if (metadata.empty()) {