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

Commit 73469a12 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Change default value of mLayerLifecycleManagerEnabled to true" into main

parents 932b2de2 5c35ea32

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1507,7 +1507,7 @@ private: 




    bool mPowerHintSessionEnabled;

    bool mPowerHintSessionEnabled;





    bool mLayerLifecycleManagerEnabled = false;

    bool mLayerLifecycleManagerEnabled = true;

    // Whether a display should be turned on when initialized

    // Whether a display should be turned on when initialized

    bool mSkipPowerOnForQuiescent;

    bool mSkipPowerOnForQuiescent;

services/surfaceflinger/tests/unittests/CompositionTest.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,6 @@ public: 
        mFlinger.setupComposer(std::unique_ptr<Hwc2::Composer>(mComposer));

        mFlinger.setupComposer(std::unique_ptr<Hwc2::Composer>(mComposer));

        mFlinger.setupPowerAdvisor(std::unique_ptr<Hwc2::PowerAdvisor>(mPowerAdvisor));

        mFlinger.setupPowerAdvisor(std::unique_ptr<Hwc2::PowerAdvisor>(mPowerAdvisor));

        mFlinger.mutableMaxRenderTargetSize() = 16384;

        mFlinger.mutableMaxRenderTargetSize() = 16384;

        mFlinger.enableLayerLifecycleManager();

    }

    }





    ~CompositionTest() {

    ~CompositionTest() {

services/surfaceflinger/tests/unittests/SurfaceFlinger_ColorMatrixTest.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ namespace android { 
class ColorMatrixTest : public CommitAndCompositeTest {};

class ColorMatrixTest : public CommitAndCompositeTest {};





TEST_F(ColorMatrixTest, colorMatrixChanged) {

TEST_F(ColorMatrixTest, colorMatrixChanged) {

    mFlinger.enableLayerLifecycleManager();

    EXPECT_COLOR_MATRIX_CHANGED(true, true);

    EXPECT_COLOR_MATRIX_CHANGED(true, true);

    mFlinger.mutableTransactionFlags() |= eTransactionNeeded;

    mFlinger.mutableTransactionFlags() |= eTransactionNeeded;
@@ -46,7 +45,6 @@ TEST_F(ColorMatrixTest, colorMatrixChanged) { 
}

}





TEST_F(ColorMatrixTest, colorMatrixChangedAfterDisplayTransaction) {

TEST_F(ColorMatrixTest, colorMatrixChangedAfterDisplayTransaction) {

    mFlinger.enableLayerLifecycleManager();

    EXPECT_COLOR_MATRIX_CHANGED(true, true);

    EXPECT_COLOR_MATRIX_CHANGED(true, true);

    mFlinger.mutableTransactionFlags() |= eTransactionNeeded;

    mFlinger.mutableTransactionFlags() |= eTransactionNeeded;

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -733,10 +733,6 @@ public: 
        return mFlinger->initTransactionTraceWriter();

        return mFlinger->initTransactionTraceWriter();

    }

    }





    // Needed since mLayerLifecycleManagerEnabled is false by default and must

    // be enabled for tests to go through the new front end path.

    void enableLayerLifecycleManager() { mFlinger->mLayerLifecycleManagerEnabled = true; }



    void notifyExpectedPresentIfRequired(PhysicalDisplayId displayId, Period vsyncPeriod,

    void notifyExpectedPresentIfRequired(PhysicalDisplayId displayId, Period vsyncPeriod,

                                         TimePoint expectedPresentTime, Fps frameInterval,

                                         TimePoint expectedPresentTime, Fps frameInterval,

                                         std::optional<Period> timeoutOpt) {

                                         std::optional<Period> timeoutOpt) {

services/surfaceflinger/tests/unittests/TransactionApplicationTest.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ public: 
        mFlinger.setupMockScheduler();

        mFlinger.setupMockScheduler();

        mFlinger.setupRenderEngine(std::unique_ptr<renderengine::RenderEngine>(mRenderEngine));

        mFlinger.setupRenderEngine(std::unique_ptr<renderengine::RenderEngine>(mRenderEngine));

        mFlinger.flinger()->addTransactionReadyFilters();

        mFlinger.flinger()->addTransactionReadyFilters();

        mFlinger.enableLayerLifecycleManager();

    }

    }





    ~TransactionApplicationTest() {

    ~TransactionApplicationTest() {