| commit | 9a465c72d82a6279de897bfa8a458d09419b2625 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins <scroggo@google.com> | Fri Dec 15 19:21:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 15 19:21:08 2023 +0000 |
| tree | 55717a36354b0c6cb455984fbdaf37925b463947 | |
| parent | 4b54be32f91d11a825f00f11aba2945a7b7b9a70 [diff] | |
| parent | ed022f7bbc0a6eeef3035b1a5e9a5d66f58b54a3 [diff] |
Merge "SF: remove unused variable on chooseCompositionStrategy." into main am: ed022f7bbc Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2875578 Change-Id: I7ea2c6da83a30e6a6dff705840f030ee81ebff63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/CompositionEngine/src/Display.cpp b/services/surfaceflinger/CompositionEngine/src/Display.cpp index 85fc095..047250a 100644 --- a/services/surfaceflinger/CompositionEngine/src/Display.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Display.cpp
@@ -250,7 +250,6 @@ } // Get any composition changes requested by the HWC device, and apply them. - std::optional<android::HWComposer::DeviceRequestedChanges> changes; auto& hwc = getCompositionEngine().getHwComposer(); const bool requiresClientComposition = anyLayersRequireClientComposition();