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

Commit 561f50de authored by Andy Hung's avatar Andy Hung Committed by Android Git Automerger
Browse files

am db995fe3: Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-dev 

* commit 'db995fe3':
  Fix getTimestamp if offload thread is not initialized.
parents 7f099ffd db995fe3

services/audioflinger/Threads.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2688,7 +2688,8 @@ status_t AudioFlinger::PlaybackThread::getTimestamp_l(AudioTimestamp& timestamp) 
    if (mNormalSink != 0) {

        return mNormalSink->getTimestamp(timestamp);

    }

    if ((mType == OFFLOAD || mType == DIRECT) && mOutput->stream->get_presentation_position) {

    if ((mType == OFFLOAD || mType == DIRECT)

            && mOutput != NULL && mOutput->stream->get_presentation_position) {

        uint64_t position64;

        int ret = mOutput->stream->get_presentation_position(

                                                mOutput->stream, &position64, &timestamp.mTime);