Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb823571 authored by Melody Hsu's avatar Melody Hsu Committed by Android (Google) Code Review
Browse files

Merge "Place recordLayerHistoryAnimationTx behind flag" into main

parents 363cc07a 2606ec0e
Loading
Loading
Loading
Loading
+13 −11
Original line number Diff line number Diff line
@@ -5252,6 +5252,7 @@ bool SurfaceFlinger::applyTransactionState(const FrameTimelineInfo& frameTimelin
                                                             desiredPresentTime, isAutoTimestamp,
                                                             postTime, transactionId);
        }
        if (!mLayerLifecycleManagerEnabled) {
            if ((flags & eAnimation) && resolvedState.state.surface) {
                if (const auto layer = LayerHandle::getLayer(resolvedState.state.surface)) {
                    const auto layerProps = scheduler::LayerProps{
@@ -5266,6 +5267,7 @@ bool SurfaceFlinger::applyTransactionState(const FrameTimelineInfo& frameTimelin
                }
            }
        }
    }

    transactionFlags |= clientStateFlags;
    transactionFlags |= addInputWindowCommands(inputWindowCommands);