Merge \\"Consider queue & dequeue times for should draw\\" into nyc-mr1-dev am: 3a465...

am: 6354336493

Change-Id: Idbe85f08c27cc6f9433badd886a1fe7d9ba73c4f

diff --cc libs/hwui/renderthread/CanvasContext.cpp
index 0a48a0c,5003c6a..27a15e0
--- 1/libs/hwui/renderthread/CanvasContext.cpp
--- 2/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@@ -240,9 -280,14 +279,14 @@@ void CanvasContext::prepareTree(TreeInf
          return;
      }
  
 -    if (CC_LIKELY(mSwapHistory.size())) {
 +    if (CC_LIKELY(mSwapHistory.size() && !Properties::forceDrawFrame)) {
          nsecs_t latestVsync = mRenderThread.timeLord().latestVsync();
-         const SwapHistory& lastSwap = mSwapHistory.back();
+         SwapHistory& lastSwap = mSwapHistory.back();
+         int durationUs;
+         mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs);
+         lastSwap.dequeueDuration = us2ns(durationUs);
+         mNativeSurface->query(NATIVE_WINDOW_LAST_QUEUE_DURATION, &durationUs);
+         lastSwap.queueDuration = us2ns(durationUs);
          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.

diff --cc libs/hwui/renderthread/CanvasContext.h
Simple merge