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

Commit fa837325 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 am: cc897ac8

Change-Id: I7285f43e14aefca16e17d016f50cabd030c5977e
parents 6d850b68 cc897ac8
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);