From b0433bc72b1876aba02c5726144cd7cbec4ffee9 Mon Sep 17 00:00:00 2001
From: Ady Abraham <adyabr@google.com>
Date: Wed, 8 Jan 2020 17:31:06 -0800
Subject: SurfaceFlinger: plumb composer 2.4 onSeamlessPossible

Plumb onSeamlessPossible callback to SurfaceFlinger.

Test: rev up composer to 2.4
Bug: 141329414
Change-Id: I2166b8ea066002c76781aacbcc985f85f7c255a8
---
 libs/vr/libvrflinger/hardware_composer.cpp | 6 ++++++
 libs/vr/libvrflinger/hardware_composer.h   | 1 +
 2 files changed, 7 insertions(+)

(limited to 'libs')

diff --git a/libs/vr/libvrflinger/hardware_composer.cpp b/libs/vr/libvrflinger/hardware_composer.cpp
index 188ac6b127..b77153835a 100644
--- a/libs/vr/libvrflinger/hardware_composer.cpp
+++ b/libs/vr/libvrflinger/hardware_composer.cpp
@@ -1215,6 +1215,12 @@ Return<void> HardwareComposer::ComposerCallback::onVsyncPeriodTimingChanged(
   return Void();
 }
 
+Return<void> HardwareComposer::ComposerCallback::onSeamlessPossible(
+    Hwc2::Display /*display*/) {
+  LOG_ALWAYS_FATAL("Unexpected onSeamlessPossible callback");
+  return Void();
+}
+
 void HardwareComposer::ComposerCallback::SetVsyncService(
     const sp<VsyncService>& vsync_service) {
   std::lock_guard<std::mutex> lock(mutex_);
diff --git a/libs/vr/libvrflinger/hardware_composer.h b/libs/vr/libvrflinger/hardware_composer.h
index 8698814a33..bfce10b5b0 100644
--- a/libs/vr/libvrflinger/hardware_composer.h
+++ b/libs/vr/libvrflinger/hardware_composer.h
@@ -381,6 +381,7 @@ class HardwareComposer {
     hardware::Return<void> onVsyncPeriodTimingChanged(
         Hwc2::Display display,
         const Hwc2::VsyncPeriodChangeTimeline& updatedTimeline) override;
+    hardware::Return<void> onSeamlessPossible(Hwc2::Display display) override;
 
     bool GotFirstHotplug() { return got_first_hotplug_; }
     void SetVsyncService(const sp<VsyncService>& vsync_service);
-- 
cgit v1.2.3-59-g8ed1b