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

Commit 84281d1c 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:... 

Merge "PatchTrackBase: fix null pointer dereference issue" into main am: f427b33f am: b4027c3d am: 973a4465 am: 0ba45af0 am: 8aa9a576 am: 01816b29

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



Change-Id: I516cabd8ed580f547506291d45be1ad1809ffc19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8f4b13e 01816b29

services/audioflinger/Tracks.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2441,7 +2441,8 @@ PatchTrack::PatchTrack(AudioFlinger::PlaybackThread *playbackThread, 
              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",
@@ -3114,7 +3115,8 @@ PatchRecord::PatchRecord(AudioFlinger::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",