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

Commit 67fba0fd authored by Ady Abraham's avatar Ady Abraham
Browse files

SurfaceFlinger: remove ISurfaceComposer::eEarlyWakeup 

This flag is deprecated.

Test: build
Bug: 159125966
Change-Id: I7422ba741a25c2247097cd4530dd84da50f02fe1
parent 99ebe3f9

libs/gui/SurfaceComposerClient.cpp

+0 −13
Original line number Diff line number Diff line
@@ -419,7 +419,6 @@ SurfaceComposerClient::Transaction::Transaction(const Transaction& other) 
        mForceSynchronous(other.mForceSynchronous),

        mTransactionNestCount(other.mTransactionNestCount),

        mAnimation(other.mAnimation),

        mEarlyWakeup(other.mEarlyWakeup),

        mExplicitEarlyWakeupStart(other.mExplicitEarlyWakeupStart),

        mExplicitEarlyWakeupEnd(other.mExplicitEarlyWakeupEnd),

        mContainsBuffer(other.mContainsBuffer),
@@ -450,7 +449,6 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel 
    const uint32_t forceSynchronous = parcel->readUint32();

    const uint32_t transactionNestCount = parcel->readUint32();

    const bool animation = parcel->readBool();

    const bool earlyWakeup = parcel->readBool();

    const bool explicitEarlyWakeupStart = parcel->readBool();

    const bool explicitEarlyWakeupEnd = parcel->readBool();

    const bool containsBuffer = parcel->readBool();
@@ -527,7 +525,6 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel 
    mForceSynchronous = forceSynchronous;

    mTransactionNestCount = transactionNestCount;

    mAnimation = animation;

    mEarlyWakeup = earlyWakeup;

    mExplicitEarlyWakeupStart = explicitEarlyWakeupStart;

    mExplicitEarlyWakeupEnd = explicitEarlyWakeupEnd;

    mContainsBuffer = containsBuffer;
@@ -559,7 +556,6 @@ status_t SurfaceComposerClient::Transaction::writeToParcel(Parcel* parcel) const 
    parcel->writeUint32(mForceSynchronous);

    parcel->writeUint32(mTransactionNestCount);

    parcel->writeBool(mAnimation);

    parcel->writeBool(mEarlyWakeup);

    parcel->writeBool(mExplicitEarlyWakeupStart);

    parcel->writeBool(mExplicitEarlyWakeupEnd);

    parcel->writeBool(mContainsBuffer);
@@ -639,7 +635,6 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::merge(Tr 
    mInputWindowCommands.merge(other.mInputWindowCommands);



    mContainsBuffer |= other.mContainsBuffer;

    mEarlyWakeup = mEarlyWakeup || other.mEarlyWakeup;

    mExplicitEarlyWakeupStart = mExplicitEarlyWakeupStart || other.mExplicitEarlyWakeupStart;

    mExplicitEarlyWakeupEnd = mExplicitEarlyWakeupEnd || other.mExplicitEarlyWakeupEnd;

    mApplyToken = other.mApplyToken;
@@ -659,7 +654,6 @@ void SurfaceComposerClient::Transaction::clear() { 
    mForceSynchronous = 0;

    mTransactionNestCount = 0;

    mAnimation = false;

    mEarlyWakeup = false;

    mExplicitEarlyWakeupStart = false;

    mExplicitEarlyWakeupEnd = false;

    mDesiredPresentTime = 0;
@@ -780,9 +774,6 @@ status_t SurfaceComposerClient::Transaction::apply(bool synchronous) { 
    if (mAnimation) {

        flags |= ISurfaceComposer::eAnimation;

    }

    if (mEarlyWakeup) {

        flags |= ISurfaceComposer::eEarlyWakeup;

    }



    // If both mExplicitEarlyWakeupStart and mExplicitEarlyWakeupEnd are set

    // it is equivalent for none
@@ -841,10 +832,6 @@ void SurfaceComposerClient::Transaction::setAnimationTransaction() { 
    mAnimation = true;

}



void SurfaceComposerClient::Transaction::setEarlyWakeup() {

    mEarlyWakeup = true;

}



void SurfaceComposerClient::Transaction::setExplicitEarlyWakeupStart() {

    mExplicitEarlyWakeupStart = true;

}

libs/gui/include/gui/ISurfaceComposer.h

+0 −3
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ public: 
        eSynchronous = 0x01,

        eAnimation = 0x02,



        // DEPRECATED - use eExplicitEarlyWakeup[Start|End]

        eEarlyWakeup = 0x04,



        // Explicit indication that this transaction and others to follow will likely result in a

        // lot of layers being composed, and thus, SurfaceFlinger should wake-up earlier to avoid

        // missing frame deadlines. In this case SurfaceFlinger will wake up at

libs/gui/include/gui/SurfaceComposerClient.h

+0 −2
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ public: 
        uint32_t mForceSynchronous = 0;

        uint32_t mTransactionNestCount = 0;

        bool mAnimation = false;

        bool mEarlyWakeup = false;

        bool mExplicitEarlyWakeupStart = false;

        bool mExplicitEarlyWakeupEnd = false;
@@ -561,7 +560,6 @@ public: 
                                  const Rect& layerStackRect, const Rect& displayRect);

        void setDisplaySize(const sp<IBinder>& token, uint32_t width, uint32_t height);

        void setAnimationTransaction();

        void setEarlyWakeup();

        void setExplicitEarlyWakeupStart();

        void setExplicitEarlyWakeupEnd();

    };

services/surfaceflinger/Scheduler/VsyncModulator.cpp

+1 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ VsyncModulator::VsyncConfigOpt VsyncModulator::setTransactionSchedule( 
            ALOGW_IF(!mExplicitEarlyWakeup, "%s: Unexpected EarlyEnd", __FUNCTION__);

            mExplicitEarlyWakeup = false;

            break;

        case Schedule::Early:

        case Schedule::Late:

            // No change to mExplicitEarlyWakeup for non-explicit states.

            break;
@@ -67,7 +66,7 @@ VsyncModulator::VsyncConfigOpt VsyncModulator::setTransactionSchedule( 
        ATRACE_INT("mExplicitEarlyWakeup", mExplicitEarlyWakeup);

    }



    if (!mExplicitEarlyWakeup && (schedule == Schedule::Early || schedule == Schedule::EarlyEnd)) {

    if (!mExplicitEarlyWakeup && schedule == Schedule::EarlyEnd) {

        mEarlyTransactionFrames = MIN_EARLY_TRANSACTION_FRAMES;

        mEarlyTransactionStartTime = mNow();

    }

services/surfaceflinger/Scheduler/VsyncModulator.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ namespace android::scheduler { 
// fixed number of frames, respectively.

enum class TransactionSchedule {

    Late,  // Default.

    Early, // Deprecated.

    EarlyStart,

    EarlyEnd

};