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

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

Browse Source
This commit is contained in:
John Reck
2016-08-01 21:54:13 +00:00
committed by Android (Google) Code Review
parent 7dd40cd411 882d515cd5
commit fc9689e1ed
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,11 +562,16 @@ void CanvasContext::draw() {
swap.damage = screenDirty; swap.damage = screenDirty;
swap.swapCompletedTime = systemTime(CLOCK_MONOTONIC); swap.swapCompletedTime = systemTime(CLOCK_MONOTONIC);
swap.vsyncTime = mRenderThread.timeLord().latestVsync(); swap.vsyncTime = mRenderThread.timeLord().latestVsync();
int durationUs; if (mNativeSurface.get()) {
mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs); int durationUs;
swap.dequeueDuration = us2ns(durationUs); mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs);
mNativeSurface->query(NATIVE_WINDOW_LAST_QUEUE_DURATION, &durationUs); swap.dequeueDuration = us2ns(durationUs);
swap.queueDuration = 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) mCurrentFrameInfo->set(FrameInfoIndex::DequeueBufferDuration)
= swap.dequeueDuration; = swap.dequeueDuration;
mCurrentFrameInfo->set(FrameInfoIndex::QueueBufferDuration) mCurrentFrameInfo->set(FrameInfoIndex::QueueBufferDuration)