summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2017-06-09 04:15:20 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-09 04:15:20 +0000
commit5d37ae59e040fdca43a92084c96d89db4be33fec (patch)
treebc63508cdc8aed10d61896780503a9ef08048797 /services/surfaceflinger/SurfaceFlinger.cpp
parentc11cc1d365c27dd888fcf01e5706c4df16816f48 (diff)
parentb1e2f8deb38353e4bcc9d3ef06bc15bd5e417425 (diff)
Properly run window animations at vsync-sf (2/2)
am: b1e2f8deb3 Change-Id: I7fbd22c681688edce1eda7f2786c68e6cbe32a22
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 13472df76a..627bf77159 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1029,8 +1029,13 @@ status_t SurfaceFlinger::injectVSync(nsecs_t when) {
// ----------------------------------------------------------------------------
-sp<IDisplayEventConnection> SurfaceFlinger::createDisplayEventConnection() {
- return mEventThread->createEventConnection();
+sp<IDisplayEventConnection> SurfaceFlinger::createDisplayEventConnection(
+ ISurfaceComposer::VsyncSource vsyncSource) {
+ if (vsyncSource == eVsyncSourceSurfaceFlinger) {
+ return mSFEventThread->createEventConnection();
+ } else {
+ return mEventThread->createEventConnection();
+ }
}
// ----------------------------------------------------------------------------