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

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

Merge "SurfaceComposerClient: Remove mForceSynchronous flag"

parents 7a122b63 2709efe8

libs/gui/SurfaceComposerClient.cpp

+7 −15
Original line number Diff line number Diff line
@@ -627,7 +627,6 @@ SurfaceComposerClient::Transaction::Transaction() { 


SurfaceComposerClient::Transaction::Transaction(const Transaction& other)

      : mId(other.mId),

        mForceSynchronous(other.mForceSynchronous),

        mTransactionNestCount(other.mTransactionNestCount),

        mAnimation(other.mAnimation),

        mEarlyWakeupStart(other.mEarlyWakeupStart),
@@ -662,7 +661,6 @@ SurfaceComposerClient::Transaction::createFromParcel(const Parcel* parcel) { 


status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel) {

    const uint64_t transactionId = parcel->readUint64();

    const uint32_t forceSynchronous = parcel->readUint32();

    const uint32_t transactionNestCount = parcel->readUint32();

    const bool animation = parcel->readBool();

    const bool earlyWakeupStart = parcel->readBool();
@@ -739,7 +737,6 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel 


    // Parsing was successful. Update the object.

    mId = transactionId;

    mForceSynchronous = forceSynchronous;

    mTransactionNestCount = transactionNestCount;

    mAnimation = animation;

    mEarlyWakeupStart = earlyWakeupStart;
@@ -770,7 +767,6 @@ status_t SurfaceComposerClient::Transaction::writeToParcel(Parcel* parcel) const 
    const_cast<SurfaceComposerClient::Transaction*>(this)->cacheBuffers();



    parcel->writeUint64(mId);

    parcel->writeUint32(mForceSynchronous);

    parcel->writeUint32(mTransactionNestCount);

    parcel->writeBool(mAnimation);

    parcel->writeBool(mEarlyWakeupStart);
@@ -890,7 +886,6 @@ void SurfaceComposerClient::Transaction::clear() { 
    mListenerCallbacks.clear();

    mInputWindowCommands.clear();

    mMayContainBuffer = false;

    mForceSynchronous = 0;

    mTransactionNestCount = 0;

    mAnimation = false;

    mEarlyWakeupStart = false;
@@ -1003,22 +998,20 @@ status_t SurfaceComposerClient::Transaction::apply(bool synchronous, bool oneWay 
    Vector<DisplayState> displayStates;

    uint32_t flags = 0;



    mForceSynchronous |= synchronous;



    for (auto const& kv : mComposerStates){

        composerStates.add(kv.second);

    }



    displayStates = std::move(mDisplayStates);



    if (mForceSynchronous) {

    if (synchronous) {

        flags |= ISurfaceComposer::eSynchronous;

    }

    if (mAnimation) {

        flags |= ISurfaceComposer::eAnimation;

    }

    if (oneWay) {

      if (mForceSynchronous) {

        if (synchronous) {

            ALOGE("Transaction attempted to set synchronous and one way at the same time"

                  " this is an invalid request. Synchronous will win for safety");

        } else {
@@ -2021,7 +2014,6 @@ void SurfaceComposerClient::Transaction::setDisplayProjection(const sp<IBinder>& 
    s.layerStackSpaceRect = layerStackRect;

    s.orientedDisplaySpaceRect = displayRect;

    s.what |= DisplayState::eDisplayProjectionChanged;

    mForceSynchronous = true; // TODO: do we actually still need this?

}



void SurfaceComposerClient::Transaction::setDisplaySize(const sp<IBinder>& token, uint32_t width, uint32_t height) {

libs/gui/include/gui/SurfaceComposerClient.h

+0 −1
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ public: 


        uint64_t mId;



        uint32_t mForceSynchronous = 0;

        uint32_t mTransactionNestCount = 0;

        bool mAnimation = false;

        bool mEarlyWakeupStart = false;