commit 3defa56f66e5583189cbd56bfde8afc66fce83df
author Stephen Kiazyk <skiazyk@google.com> Tue May 09 00:41:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 09 00:41:01 2017 +0000
tree 2fcd99f1ddd422ff97b3b4d47483a918a5a3c839
parent 5176d1bef55e448226bd0fee07c89553de706ae3
parent 71c79d34f788e3b731c8f932787250980692d1a0

Merge "Prevent buggy display orientation when exiting vr" into oc-dev am: 95d4e52244
am: 71c79d34f7

Change-Id: I823d21b127cd9e90a536da7df3517f16812701c3

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 1456429..505e81c 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1262,7 +1262,6 @@
         }
     }
     mDisplays.clear();
-    initializeDisplays();
 }
 
 void SurfaceFlinger::updateVrFlinger() {
@@ -1309,6 +1308,12 @@
     // parts of this class rely on the primary display always being available.
     createDefaultDisplayDevice();
 
+    // Reset the timing values to account for the period of the swapped in HWC
+    const auto& activeConfig = mHwc->getActiveConfig(HWC_DISPLAY_PRIMARY);
+    const nsecs_t period = activeConfig->getVsyncPeriod();
+    mAnimFrameTracker.setDisplayRefreshPeriod(period);
+    setCompositorTimingSnapped(0, period, 0);
+
     android_atomic_or(1, &mRepaintEverything);
     setTransactionFlags(eDisplayTransactionNeeded);
 }