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

Commit e685bb48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Delete unused mask eTransactionMask parameter"

parents 99a164e6 c8251eb7

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ void SurfaceFlinger::onMessageReceived(int32_t what) { 
}



bool SurfaceFlinger::handleMessageTransaction() {

    uint32_t transactionFlags = peekTransactionFlags(eTransactionMask);

    uint32_t transactionFlags = peekTransactionFlags();

    if (transactionFlags) {

        handleTransaction(transactionFlags);

        return true;
@@ -2305,7 +2305,7 @@ status_t SurfaceFlinger::removeLayer(const wp<Layer>& weakLayer) { 
    return status_t(index);

}



uint32_t SurfaceFlinger::peekTransactionFlags(uint32_t /* flags */) {

uint32_t SurfaceFlinger::peekTransactionFlags() {

    return android_atomic_release_load(&mTransactionFlags);

}

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ private: 
     * Transactions

     */

    uint32_t getTransactionFlags(uint32_t flags);

    uint32_t peekTransactionFlags(uint32_t flags);

    uint32_t peekTransactionFlags();

    uint32_t setTransactionFlags(uint32_t flags);

    void commitTransaction();

    uint32_t setClientStateLocked(const sp<Client>& client, const layer_state_t& s);

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1050,7 +1050,7 @@ void SurfaceFlinger::onMessageReceived(int32_t what) { 
}



bool SurfaceFlinger::handleMessageTransaction() {

    uint32_t transactionFlags = peekTransactionFlags(eTransactionMask);

    uint32_t transactionFlags = peekTransactionFlags();

    if (transactionFlags) {

        handleTransaction(transactionFlags);

        return true;
@@ -2223,7 +2223,7 @@ status_t SurfaceFlinger::removeLayer(const wp<Layer>& weakLayer) { 
    return status_t(index);

}



uint32_t SurfaceFlinger::peekTransactionFlags(uint32_t /* flags */) {

uint32_t SurfaceFlinger::peekTransactionFlags() {

    return android_atomic_release_load(&mTransactionFlags);

}