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

Commit 8310ef74 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused mTransactionNestCount" into main

parents 93f2b5ee 62f0c202

libs/gui/SurfaceComposerClient.cpp

+0 −5
Original line number Diff line number Diff line
@@ -827,7 +827,6 @@ SurfaceComposerClient::Transaction::Transaction() { 


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

      : mId(other.mId),

        mTransactionNestCount(other.mTransactionNestCount),

        mAnimation(other.mAnimation),

        mEarlyWakeupStart(other.mEarlyWakeupStart),

        mEarlyWakeupEnd(other.mEarlyWakeupEnd),
@@ -867,7 +866,6 @@ SurfaceComposerClient::Transaction::createFromParcel(const Parcel* parcel) { 


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

    const uint64_t transactionId = parcel->readUint64();

    const uint32_t transactionNestCount = parcel->readUint32();

    const bool animation = parcel->readBool();

    const bool earlyWakeupStart = parcel->readBool();

    const bool earlyWakeupEnd = parcel->readBool();
@@ -964,7 +962,6 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel 


    // Parsing was successful. Update the object.

    mId = transactionId;

    mTransactionNestCount = transactionNestCount;

    mAnimation = animation;

    mEarlyWakeupStart = earlyWakeupStart;

    mEarlyWakeupEnd = earlyWakeupEnd;
@@ -996,7 +993,6 @@ status_t SurfaceComposerClient::Transaction::writeToParcel(Parcel* parcel) const 
    const_cast<SurfaceComposerClient::Transaction*>(this)->cacheBuffers();



    parcel->writeUint64(mId);

    parcel->writeUint32(mTransactionNestCount);

    parcel->writeBool(mAnimation);

    parcel->writeBool(mEarlyWakeupStart);

    parcel->writeBool(mEarlyWakeupEnd);
@@ -1148,7 +1144,6 @@ void SurfaceComposerClient::Transaction::clear() { 
    mInputWindowCommands.clear();

    mUncacheBuffers.clear();

    mMayContainBuffer = false;

    mTransactionNestCount = 0;

    mAnimation = false;

    mEarlyWakeupStart = false;

    mEarlyWakeupEnd = false;

libs/gui/include/gui/SurfaceComposerClient.h

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


        uint64_t mId;



        uint32_t mTransactionNestCount = 0;

        bool mAnimation = false;

        bool mEarlyWakeupStart = false;

        bool mEarlyWakeupEnd = false;