summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/DisplayDevice.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-08-28 00:34:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-08-28 00:34:07 +0000
commitdc3a107e805cbdef29e06bc022ca5f9dc13a8fe3 (patch)
tree63edaa29db89a54ea58fdae57affb1b09e16394e /services/surfaceflinger/DisplayDevice.cpp
parent6407571b2233f69c7bb5abe41cc6fe7de2cd8e8a (diff)
parentfb95bccad4a39a320f8d76d1f3a7f48b952daab3 (diff)
Merge "SF: Use compositionInfo after HWC changedTypes"
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;
}