summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/DisplayDevice.cpp
diff options
context:
space:
mode:
author David Sodman <dsodman@google.com> 2017-12-22 15:45:30 -0800
committer David Sodman <dsodman@google.com> 2018-08-27 16:35:31 -0700
commitfb95bccad4a39a320f8d76d1f3a7f48b952daab3 (patch)
treed67ebc58e59785c16d4717b9ed6cd94f3959b7dc /services/surfaceflinger/DisplayDevice.cpp
parent04c1e67e51da24ded2f72f5d88f10d5529a80fdb (diff)
SF: Use compositionInfo after HWC changedTypes
Bug: 112259502 Test: cts -m CtsViewTestCases SurfaceFlinger_test vrflinger_test Change-Id: I908f439eedfab9ee8241f8ac594465527f93408a
Diffstat (limited to 'services/surfaceflinger/DisplayDevice.cpp')
-rw-r--r--services/surfaceflinger/DisplayDevice.cpp5
1 files changed, 3 insertions, 2 deletions
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;
}