Merge "EGL: Add eglGetCompositorTimingANDROID."

diff --cc include/gui/Surface.h
Simple merge

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

diff --cc opengl/libs/EGL/eglApi.cpp
Simple merge

diff --cc services/surfaceflinger/Layer.cpp
Simple merge

diff --cc services/surfaceflinger/Layer.h
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger.cpp
index cbc209d,70bd7be..d2dddba
--- 1/services/surfaceflinger/SurfaceFlinger.cpp
--- 2/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@@ -1261,11 -1148,10 +1266,12 @@@ void SurfaceFlinger::onMessageReceived(
      ATRACE_CALL();
      switch (what) {
          case MessageQueue::INVALIDATE: {
 +            updateVrMode();
 +
              bool frameMissed = !mHadClientComposition &&
                      mPreviousPresentFence != Fence::NO_FENCE &&
-                     mPreviousPresentFence->getSignalTime() == INT64_MAX;
+                     (mPreviousPresentFence->getSignalTime() ==
+                             Fence::SIGNAL_TIME_PENDING);
              ATRACE_INT("FrameMissed", static_cast<int>(frameMissed));
              if (mPropagateBackpressure && frameMissed) {
                  signalLayerUpdate();

diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge

diff --cc services/surfaceflinger/SurfaceFlinger_hwc1.cpp
Simple merge