diff options
| author | 2022-05-18 22:29:14 +0000 | |
|---|---|---|
| committer | 2022-05-18 22:29:14 +0000 | |
| commit | 07f2340cb5d80a6fc7170c0168f26dc8dd748adc (patch) | |
| tree | 7ad6ac86c74094248a60dbd4e10b002a6f9c3b15 /services/surfaceflinger/Layer.cpp | |
| parent | c556e4694ae1d2d9d44110f10f95bf1215d8a046 (diff) | |
| parent | 56ceadd8672e07677fd82d853fc282c4c8dee47f (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/Layer.cpp')
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 39686e0a07..b1de9665d5 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -211,7 +211,7 @@ LayerCreationArgs::LayerCreationArgs(SurfaceFlinger* flinger, sp<Client> client, * Layer. So, the implementation is done in BufferLayer. When called on a * EffectLayer object, it's essentially a NOP. */ -void Layer::onLayerDisplayed(std::shared_future<FenceResult>) {} +void Layer::onLayerDisplayed(ftl::SharedFuture<FenceResult>) {} void Layer::removeRelativeZ(const std::vector<Layer*>& layersInTree) { if (mDrawingState.zOrderRelativeOf == nullptr) { |