commit f9ba0861706a651fc7aed468207e5f3522efd55a
author Jorim Jaggi <jjaggi@google.com> Fri Jun 09 08:02:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 09 08:02:05 2017 +0000
tree 75f8781517e51122363b8a25b5a7b6ea72b2ae7a
parent 879089b3e8b38a5c3e81bd76d0c921d6c941a50a
parent 2c410e0d5f87df03822c659fb3181753e5a6668b

Fix build am: aaef0983ba
am: 2c410e0d5f

Change-Id: I10728186af370d9e47196eeda43dfeccc582bc74

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
index 0b3a0d0..6ea070d 100644
--- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
+++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
@@ -933,8 +933,13 @@
 
 // ----------------------------------------------------------------------------
 
-sp<IDisplayEventConnection> SurfaceFlinger::createDisplayEventConnection() {
-    return mEventThread->createEventConnection();
+sp<IDisplayEventConnection> SurfaceFlinger::createDisplayEventConnection(
+        ISurfaceComposer::VsyncSource vsyncSource) {
+    if (vsyncSource == eVsyncSourceSurfaceFlinger) {
+        return mSFEventThread->createEventConnection();
+    } else {
+        return mEventThread->createEventConnection();
+    }
 }
 
 // ----------------------------------------------------------------------------