summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/BufferQueueLayer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-18 22:29:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-18 22:29:14 +0000
commit07f2340cb5d80a6fc7170c0168f26dc8dd748adc (patch)
tree7ad6ac86c74094248a60dbd4e10b002a6f9c3b15 /services/surfaceflinger/BufferQueueLayer.cpp
parentc556e4694ae1d2d9d44110f10f95bf1215d8a046 (diff)
parent56ceadd8672e07677fd82d853fc282c4c8dee47f (diff)
Merge "FTL: Yield futures without overhead" into tm-dev am: 56ceadd867
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18283743 Change-Id: I735cc7df622a694628926c228395d29c10e45ad6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'services/surfaceflinger/BufferQueueLayer.cpp')
-rw-r--r--services/surfaceflinger/BufferQueueLayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index f487aab9ce..bee4de32a6 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -48,7 +48,7 @@ BufferQueueLayer::~BufferQueueLayer() {
// Interface implementation for Layer
// -----------------------------------------------------------------------
-void BufferQueueLayer::onLayerDisplayed(std::shared_future<FenceResult> futureFenceResult) {
+void BufferQueueLayer::onLayerDisplayed(ftl::SharedFuture<FenceResult> futureFenceResult) {
const sp<Fence> releaseFence = futureFenceResult.get().value_or(Fence::NO_FENCE);
mConsumer->setReleaseFence(releaseFence);