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

Commit 8b4bcef7 authored by Vlad Popa's avatar Vlad Popa Committed by Automerger Merge Worker
Browse files

CSD: Fix possible crash when accessing nullptr am: 1a0c3abf 

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



Change-Id: I2b5b919f21e9a10ca09eee33946c50c0180f0b10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07f63b25 1a0c3abf

services/audioflinger/Threads.cpp

+6 −2
Original line number Diff line number Diff line
@@ -3488,15 +3488,19 @@ void AudioFlinger::PlaybackThread::startMelComputation_l( 
        const sp<audio_utils::MelProcessor>& processor)

{

    auto outputSink = static_cast<AudioStreamOutSink*>(mOutputSink.get());

    if (outputSink != nullptr) {

        outputSink->startMelComputation(processor);

    }

}



// stopMelComputation_l() must be called with AudioFlinger::mLock held

void AudioFlinger::PlaybackThread::stopMelComputation_l()

{

    auto outputSink = static_cast<AudioStreamOutSink*>(mOutputSink.get());

    if (outputSink != nullptr) {

        outputSink->stopMelComputation();

    }

}



void AudioFlinger::PlaybackThread::threadLoop_drain()

{