Merge "BQ: Remove getNextFrameNumber Binder call" into nyc-mr1-dev

diff --cc include/gui/Surface.h
index b9ffc49,37e2bec..8177ec6
--- 1/include/gui/Surface.h
--- 2/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@@ -370,11 -370,9 +370,13 @@@ private
      // used to prevent a mismatch between the number of queue/dequeue calls.
      bool mSharedBufferHasBeenQueued;
  
 +    // These are used to satisfy the NATIVE_WINDOW_LAST_*_DURATION queries
 +    nsecs_t mLastDequeueDuration = 0;
 +    nsecs_t mLastQueueDuration = 0;
 +
      Condition mQueueBufferCondition;
+ 
+     uint64_t mNextFrameNumber;
  };
  
  namespace view {

diff --cc libs/gui/IGraphicBufferProducer.cpp
Simple merge

diff --cc libs/gui/Surface.cpp
Simple merge