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

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

Merge changes I2f5c4d68,I65d5bd14 into main 

* changes:
  [legacy sf flag] - Remove legacy methods for front end
  [legacy sf flag] - Remove layerLifecycleManagerEnabled
parents 53eb159d 7d27034a

services/surfaceflinger/Layer.cpp

+0 −8
Original line number Diff line number Diff line
@@ -2540,10 +2540,6 @@ bool Layer::hasInputInfo() const { 
compositionengine::OutputLayer* Layer::findOutputLayerForDisplay(

        const DisplayDevice* display) const {

    if (!display) return nullptr;

    if (!mFlinger->mLayerLifecycleManagerEnabled) {

        return display->getCompositionDisplay()->getOutputLayerForLayer(

                getCompositionEngineLayerFE());

    }

    sp<LayerFE> layerFE;

    frontend::LayerHierarchy::TraversalPath path{.id = static_cast<uint32_t>(sequence)};

    for (auto& [p, layer] : mLayerFEs) {
@@ -2559,10 +2555,6 @@ compositionengine::OutputLayer* Layer::findOutputLayerForDisplay( 
compositionengine::OutputLayer* Layer::findOutputLayerForDisplay(

        const DisplayDevice* display, const frontend::LayerHierarchy::TraversalPath& path) const {

    if (!display) return nullptr;

    if (!mFlinger->mLayerLifecycleManagerEnabled) {

        return display->getCompositionDisplay()->getOutputLayerForLayer(

                getCompositionEngineLayerFE());

    }

    sp<LayerFE> layerFE;

    for (auto& [p, layer] : mLayerFEs) {

        if (p == path) {

services/surfaceflinger/SurfaceFlinger.cpp

+90 −371

File changed.

Preview size limit exceeded, changes collapsed.

services/surfaceflinger/SurfaceFlinger.h

+0 −12

File changed.

Preview size limit exceeded, changes collapsed.