diff options
| author | Scott Lobdell <slobdell@google.com> | 2020-10-15 11:45:45 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2020-10-27 13:09:24 -0700 |
| commit | 449f659b21d039b8692602294b040038ac1e6ccb (patch) | |
| tree | 8d7f4ce2697ad1b591d2f953e69656bc9b0a4080 /libs/hwui/renderthread/RenderThread.cpp | |
| parent | 5cced294627474a5a42b42e442a50690d5c76661 (diff) | |
| parent | fb4ede1992df0344082bbdac60bcbc2a3a0a65ba (diff) | |
Merge SP1A.201015.001
Change-Id: Ie33f12a2f4c73443640c28ad128be96b3533fd8c
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 9371656eda7f..a101d46f6da0 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -52,8 +52,9 @@ static JVMAttachHook gOnStartHook = nullptr; void RenderThread::frameCallback(int64_t frameTimeNanos, void* data) { RenderThread* rt = reinterpret_cast<RenderThread*>(data); int64_t vsyncId = AChoreographer_getVsyncId(rt->mChoreographer); + int64_t frameDeadline = AChoreographer_getFrameDeadline(rt->mChoreographer); rt->mVsyncRequested = false; - if (rt->timeLord().vsyncReceived(frameTimeNanos, frameTimeNanos, vsyncId) && + if (rt->timeLord().vsyncReceived(frameTimeNanos, frameTimeNanos, vsyncId, frameDeadline) && !rt->mFrameCallbackTaskPending) { ATRACE_NAME("queue mFrameCallbackTask"); rt->mFrameCallbackTaskPending = true; |