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

Commit 973a4465 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "PatchTrackBase: fix null pointer dereference issue" into main am: f427b33f am: b4027c3d 

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



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

services/audioflinger/Tracks.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2186,7 +2186,8 @@ AudioFlinger::PlaybackThread::PatchTrack::PatchTrack(PlaybackThread *playbackThr 
              buffer, bufferSize, nullptr /* sharedBuffer */,

              AUDIO_SESSION_NONE, getpid(), audioServerAttributionSource(getpid()), flags,

              TYPE_PATCH, AUDIO_PORT_HANDLE_NONE, frameCountToBeReady),

        PatchTrackBase(new ClientProxy(mCblk, mBuffer, frameCount, mFrameSize, true, true),

        PatchTrackBase(mCblk ? new ClientProxy(mCblk, mBuffer, frameCount, mFrameSize, true, true)

                        : nullptr,

                       *playbackThread, timeout)

{

    ALOGV("%s(%d): sampleRate %d mPeerTimeout %d.%03d sec",
@@ -2766,7 +2767,8 @@ AudioFlinger::RecordThread::PatchRecord::PatchRecord(RecordThread *recordThread, 
                sampleRate, format, channelMask, frameCount,

                buffer, bufferSize, AUDIO_SESSION_NONE, getpid(),

                audioServerAttributionSource(getpid()), flags, TYPE_PATCH),

        PatchTrackBase(new ClientProxy(mCblk, mBuffer, frameCount, mFrameSize, false, true),

        PatchTrackBase(mCblk ? new ClientProxy(mCblk, mBuffer, frameCount, mFrameSize, false, true)

                        : nullptr,

                       *recordThread, timeout)

{

    ALOGV("%s(%d): sampleRate %d mPeerTimeout %d.%03d sec",