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

Commit 38258638 authored by Marissa Wall's avatar Marissa Wall Committed by android-build-merger
Browse files

Merge "surfaceflinger: IBinder leak" into qt-dev am: aed14698 

am: 1f6a325a

Change-Id: I938ed78d5f1b265e2232c7fc42267b4c37f170a7
parents 66072c2c 1f6a325a

services/surfaceflinger/TransactionCompletedThread.cpp

+6 −1
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ status_t TransactionCompletedThread::addPresentedCallbackHandles( 
        } else {

            ALOGW("cannot find listener in mPendingTransactions");

        }

        if (listener->second.size() == 0) {

            mPendingTransactions.erase(listener);

        }



        status_t err = addCallbackHandle(handle);

        if (err != NO_ERROR) {
@@ -231,7 +234,9 @@ void TransactionCompletedThread::threadMain() { 


                // If we are still waiting on the callback handles for this transaction, stop

                // here because all transaction callbacks for the same listener must come in order

                if (mPendingTransactions[listener].count(transactionStats.callbackIds) != 0) {

                auto pendingTransactions = mPendingTransactions.find(listener);

                if (pendingTransactions != mPendingTransactions.end() &&

                    pendingTransactions->second.count(transactionStats.callbackIds) != 0) {

                    break;

                }