From fb95bccad4a39a320f8d76d1f3a7f48b952daab3 Mon Sep 17 00:00:00 2001
From: David Sodman <dsodman@google.com>
Date: Fri, 22 Dec 2017 15:45:30 -0800
Subject: SF: Use compositionInfo after HWC changedTypes

Bug: 112259502
Test: cts -m CtsViewTestCases
      SurfaceFlinger_test
      vrflinger_test

Change-Id: I908f439eedfab9ee8241f8ac594465527f93408a
---
 services/surfaceflinger/DisplayDevice.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'services/surfaceflinger/DisplayDevice.cpp')

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 0fbd4594f8..aab6c22819 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -334,8 +334,9 @@ status_t DisplayDevice::beginFrame(bool mustRecompose) const {
     return mDisplaySurface->beginFrame(mustRecompose);
 }
 
-status_t DisplayDevice::prepareFrame(HWComposer& hwc) {
-    status_t error = hwc.prepare(*this);
+status_t DisplayDevice::prepareFrame(HWComposer& hwc,
+        std::vector<CompositionInfo>& compositionData) {
+    status_t error = hwc.prepare(*this, compositionData);
     if (error != NO_ERROR) {
         return error;
     }
-- 
cgit v1.2.3-59-g8ed1b