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

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

Merge "Resume HW after forced pause during flush" am: 15bd303c 

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



Change-Id: Iac48dcd73c9c61106fac9d10b2324ecd5f9563fc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79a6cde9 15bd303c

services/audioflinger/Threads.cpp

+2 −0
Original line number Diff line number Diff line
@@ -6430,6 +6430,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep 
            (doHwPause || (mFlushPending && !mHwPaused && (count != 0)))) {

        status_t result = mOutput->stream->pause();

        ALOGE_IF(result != OK, "Error when pausing output stream: %d", result);

        doHwResume = !doHwPause;  // resume if pause is due to flush.

    }

    if (mFlushPending) {

        flushHw_l();
@@ -7000,6 +7001,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr 
    if (!mStandby && (doHwPause || (mFlushPending && !mHwPaused && (count != 0)))) {

        status_t result = mOutput->stream->pause();

        ALOGE_IF(result != OK, "Error when pausing output stream: %d", result);

        doHwResume = !doHwPause;  // resume if pause is due to flush.

    }

    if (mFlushPending) {

        flushHw_l();