commit 07874a36078d93e8b29b22c0cb576414e9c07f92
author qctecmdr <qctecmdr@localhost> Thu Apr 30 06:29:13 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 30 06:29:13 2020 -0700
tree cb9807683b91f110dbc0b45db0e4a464a40a9e2d
parent 761166d05e8d080cf3d573a52d1a3fe2728743d1
parent fb32da50493f72c042aeccf9feac2bd3f2479338

Merge "composer: Fix function parameters mismatch."

composer/QtiComposerClient.cpp

diff --git a/composer/QtiComposerClient.cpp b/composer/QtiComposerClient.cpp
index fe47715..f48bf49 100644
--- a/composer/QtiComposerClient.cpp
+++ b/composer/QtiComposerClient.cpp
@@ -170,11 +170,16 @@
 }
 
 void QtiComposerClient::onVsyncPeriodTimingChanged(hwc2_callback_data_t callbackData,
-      hwc2_display_t display, const VsyncPeriodChangeTimeline& updatedTimeline) {
+      hwc2_display_t display, hwc_vsync_period_change_timeline_t *updatedTimeline) {
+   VsyncPeriodChangeTimeline timeline =
+                                   {updatedTimeline->newVsyncAppliedTimeNanos,
+                                    static_cast<bool>(updatedTimeline->refreshRequired),
+                                    updatedTimeline->refreshTimeNanos};
+
   auto client = reinterpret_cast<QtiComposerClient*>(callbackData);
-  auto ret = client->callback24_->onVsyncPeriodTimingChanged(display, updatedTimeline);
+  auto ret = client->callback24_->onVsyncPeriodTimingChanged(display, timeline);
   ALOGW_IF(!ret.isOk(), "failed to send onVsyncPeriodTimingChanged: %s. SF likely unavailable.",
-           ret.description().c_str());
+          ret.description().c_str());
 }
 
 void QtiComposerClient::onSeamlessPossible(hwc2_callback_data_t callbackData,

composer/QtiComposerClient.h

diff --git a/composer/QtiComposerClient.h b/composer/QtiComposerClient.h
index 3e55954..77fb14e 100644
--- a/composer/QtiComposerClient.h
+++ b/composer/QtiComposerClient.h
@@ -225,7 +225,7 @@
                           int64_t timestamp, VsyncPeriodNanos vsyncPeriodNanos);
   static void onVsyncPeriodTimingChanged(hwc2_callback_data_t callbackData,
                                            hwc2_display_t display,
-                                           const VsyncPeriodChangeTimeline& updatedTimeline);
+                                           hwc_vsync_period_change_timeline_t* updatedTimeline);
   static void onSeamlessPossible(hwc2_callback_data_t callbackData, hwc2_display_t display);
 
   // Methods for ConcurrentWriteBack