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

Commit fc9689e1 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix null deref crash" into nyc-mr1-dev

parents 7dd40cd4 882d515c

libs/hwui/renderthread/CanvasContext.cpp

+10 −5
Original line number Diff line number Diff line
@@ -562,11 +562,16 @@ void CanvasContext::draw() { 
        swap.damage = screenDirty;

        swap.swapCompletedTime = systemTime(CLOCK_MONOTONIC);

        swap.vsyncTime = mRenderThread.timeLord().latestVsync();

        if (mNativeSurface.get()) {

            int durationUs;

            mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs);

            swap.dequeueDuration = us2ns(durationUs);

            mNativeSurface->query(NATIVE_WINDOW_LAST_QUEUE_DURATION, &durationUs);

            swap.queueDuration = us2ns(durationUs);

        } else {

            swap.dequeueDuration = 0;

            swap.queueDuration = 0;

        }

        mCurrentFrameInfo->set(FrameInfoIndex::DequeueBufferDuration)

                = swap.dequeueDuration;

        mCurrentFrameInfo->set(FrameInfoIndex::QueueBufferDuration)