diff options
author | 2015-11-24 19:17:25 +0000 | |
---|---|---|
committer | 2015-11-24 19:17:25 +0000 | |
commit | 1aec623fe90a2bb7ae16a49041e7d062275ecd23 (patch) | |
tree | bc510f80cdc26310a1a2696b6e455dd09a5aa9d9 | |
parent | 9549544ab91e6b8edd7111057867b4feca5bd362 (diff) | |
parent | 52b783f76af58a948dad4d3b4d1b7ad7979347ce (diff) |
Merge "INT_MAX nanoseconds is not very long"
-rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 89cadea775f3..ca85dfbf1bab 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -237,7 +237,7 @@ void CanvasContext::prepareTree(TreeInfo& info, int64_t* uiFrameInfo, if (CC_LIKELY(mSwapHistory.size())) { nsecs_t latestVsync = mRenderThread.timeLord().latestVsync(); const SwapHistory& lastSwap = mSwapHistory.back(); - int vsyncDelta = std::abs(lastSwap.vsyncTime - latestVsync); + nsecs_t vsyncDelta = std::abs(lastSwap.vsyncTime - latestVsync); // The slight fudge-factor is to deal with cases where // the vsync was estimated due to being slow handling the signal. // See the logic in TimeLord#computeFrameTimeNanos or in |