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

Commit d432a7c4 authored by Lloyd Pique's avatar Lloyd Pique
Browse files

SF: Clean up updateTransformHint() processing. 

While working on ag/3368935, an unintentional duplicate call was added
to Layer::updateTransform() from
SurfaceFlinger::handleTransactionLocked(). This patch removes the
duplicate call.

In examining the code, the update conditions also did not appear to be
set correctly. They have been adjusted so that a display change or a
significant layer change (such as a layer being added) will result in an
update.

Bug: 76223411
Test: No immediate issues observed on a Pixel XL.

Change-Id: I59220837b22ae1f76d7d9d376c1ebd24d8d14105
parent 0c2de368

services/surfaceflinger/SurfaceFlinger.cpp

+12 −12
Original line number Diff line number Diff line
@@ -2357,7 +2357,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags) 
        processDisplayHotplugEventsLocked();

    }



    if (transactionFlags & (eTraversalNeeded|eDisplayTransactionNeeded)) {

    if (transactionFlags & (eDisplayLayerStackChanged|eDisplayTransactionNeeded)) {

        // The transform hint might have changed for some layers

        // (either because a display has changed, or because a layer

        // as changed).
@@ -2404,7 +2404,6 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags) 
                }

            }



            if (transactionFlags & eDisplayTransactionNeeded) {

            if (disp == nullptr) {

                // NOTE: TEMPORARY FIX ONLY. Real fix should cause layers to

                // redraw after transform hint changes. See bug 8508397.
@@ -2414,8 +2413,9 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags) 
                // screen off/on times.

                disp = getDefaultDisplayDeviceLocked();

            }

                layer->updateTransformHint(disp);

            }



            // disp can be null if there is no display available at all to get

            // the transform hint from.

            if (disp != nullptr) {

                layer->updateTransformHint(disp);

            }
@@ -3250,7 +3250,7 @@ uint32_t SurfaceFlinger::setClientStateLocked(const ComposerState& composerState 
            mCurrentState.layersSortedByZ.add(layer);

            // we need traversal (state changed)

            // AND transaction (list changed)

            flags |= eTransactionNeeded|eTraversalNeeded;

            flags |= eTransactionNeeded|eTraversalNeeded|eDisplayLayerStackChanged;

        }

    }

    if (what & layer_state_t::eDeferTransaction) {

services/surfaceflinger/SurfaceFlinger.h

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ enum { 
    eTransactionNeeded        = 0x01,

    eTraversalNeeded          = 0x02,

    eDisplayTransactionNeeded = 0x04,

    eTransactionMask          = 0x07

    eDisplayLayerStackChanged = 0x08,

    eTransactionMask          = 0x0f,

};



class SurfaceFlingerBE