Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[HWUI] Add null check for CanvasContext" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-28 04:02:31 +00:00
committed by Android (Google) Code Review
parent a8d6a321d3 026106f6d6
commit c2e20c4b8a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/renderthread/CanvasContext.cpp
View File

@@ -555,9 +555,11 @@ void CanvasContext::draw() {
FrameInfo* forthBehind = mLast4FrameInfos.front().first; FrameInfo* forthBehind = mLast4FrameInfos.front().first;
int64_t composedFrameId = mLast4FrameInfos.front().second; int64_t composedFrameId = mLast4FrameInfos.front().second;
nsecs_t acquireTime = -1; nsecs_t acquireTime = -1;
if (mNativeSurface) {
native_window_get_frame_timestamps(mNativeSurface->getNativeWindow(), composedFrameId, native_window_get_frame_timestamps(mNativeSurface->getNativeWindow(), composedFrameId,
nullptr, &acquireTime, nullptr, nullptr, nullptr, nullptr, &acquireTime, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr); nullptr, nullptr, nullptr, nullptr);
}
// Ignore default -1, NATIVE_WINDOW_TIMESTAMP_INVALID and NATIVE_WINDOW_TIMESTAMP_PENDING // Ignore default -1, NATIVE_WINDOW_TIMESTAMP_INVALID and NATIVE_WINDOW_TIMESTAMP_PENDING
forthBehind->set(FrameInfoIndex::GpuCompleted) = acquireTime > 0 ? acquireTime : -1; forthBehind->set(FrameInfoIndex::GpuCompleted) = acquireTime > 0 ? acquireTime : -1;
mJankTracker.finishGpuDraw(*forthBehind); mJankTracker.finishGpuDraw(*forthBehind);