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

Commit e8abc92d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[HWUI] Add null check for CanvasContext" into rvc-dev am: c2e20c4b...

Merge "[HWUI] Add null check for CanvasContext" into rvc-dev am: c2e20c4b am: cc897ac8 am: fa837325

Change-Id: I62576afe11ef152313942924313cb313c3fb322b
parents 66afd61e fa837325
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -555,9 +555,11 @@ void CanvasContext::draw() {
        FrameInfo* forthBehind = mLast4FrameInfos.front().first;
        int64_t composedFrameId = mLast4FrameInfos.front().second;
        nsecs_t acquireTime = -1;
        if (mNativeSurface) {
            native_window_get_frame_timestamps(mNativeSurface->getNativeWindow(), composedFrameId,
                                               nullptr, &acquireTime, nullptr, nullptr, nullptr,
                                               nullptr, nullptr, nullptr, nullptr);
        }
        // Ignore default -1, NATIVE_WINDOW_TIMESTAMP_INVALID and NATIVE_WINDOW_TIMESTAMP_PENDING
        forthBehind->set(FrameInfoIndex::GpuCompleted) = acquireTime > 0 ? acquireTime : -1;
        mJankTracker.finishGpuDraw(*forthBehind);