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

Commit dd8dc21d authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audioflinger: fix duplicating track start with a2dp output suspended"... 

Merge "audioflinger: fix duplicating track start with a2dp output suspended" into udc-dev am: a8cb431d

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



Change-Id: I9578cba60cd3689f31401c12133cd225fa374c17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5828ec4d a8cb431d

services/audioflinger/Threads.cpp

+3 −2
Original line number Diff line number Diff line
@@ -4110,8 +4110,9 @@ NO_THREAD_SAFETY_ANALYSIS // manual locking of AudioFlinger 


            // signal actual start of output stream when the render position reported by the kernel

            // starts moving.

            if (!mStandby && !mHalStarted && mKernelPositionOnStandby !=

                    mTimestamp.mPosition[ExtendedTimestamp::LOCATION_KERNEL]) {

            if (!mHalStarted && ((isSuspended() && (mBytesWritten != 0)) || (!mStandby

                    && (mKernelPositionOnStandby

                            != mTimestamp.mPosition[ExtendedTimestamp::LOCATION_KERNEL])))) {

                mHalStarted = true;

                mWaitHalStartCV.broadcast();

            }