diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-09 17:17:04 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-09 17:17:04 +0000 |
| commit | 24d7d83fdd462002e24142f0587f5fd38441df35 (patch) | |
| tree | e317264e8fdbd02ec7f0c0c9f523dd137936dbe0 | |
| parent | dd90d080837a6be723336421eb497105c547aa78 (diff) | |
| parent | 956ddf52cd27283517cc3684c1d20c15aea21c09 (diff) | |
| download | native-24d7d83fdd462002e24142f0587f5fd38441df35.tar.gz | |
Merge cherrypicks of [2386383, 2386384] into oc-release
Change-Id: I08619b00062064e8337eea81d6c5de96244aad08
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger_hwc1.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp index 7070b97b1e..e19e021239 100644 --- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp +++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp @@ -932,8 +932,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(); + } } // ---------------------------------------------------------------------------- |