commit 5a556bc71eb0f1127d09bcfdc28fb9df719f3512
author Jorim Jaggi <jjaggi@google.com> Fri Jun 09 07:59:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 09 07:59:34 2017 +0000
tree 75f8781517e51122363b8a25b5a7b6ea72b2ae7a
parent 5d37ae59e040fdca43a92084c96d89db4be33fec
parent aaef0983baf38bd59b4129dd37e4cd21b73d92ad

Fix build
am: aaef0983ba

Change-Id: Ia4d360cb942c43180d6077cd01bd9e9eb5b598d5

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();
+    }
 }
 
 // ----------------------------------------------------------------------------