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

Commit 3323a6e4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018,... 

Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886, 8558887, 8558888, 8558889, 8558071, 8558072, 8556231] into qt-release

Change-Id: If94b5583cacf7855e75758a6998568eefa39026b
parents ba0112f5 369d1f5d

services/surfaceflinger/TransactionCompletedThread.cpp

+8 −2
Original line number Original line Diff line number Diff line
@@ -197,8 +197,14 @@ status_t TransactionCompletedThread::addCallbackHandle(const sp<CallbackHandle>& 
    }

    }





    transactionStats->latchTime = handle->latchTime;

    transactionStats->latchTime = handle->latchTime;

    transactionStats->surfaceStats.emplace_back(handle->surfaceControl, handle->acquireTime,

    // If the layer has already been destroyed, don't add the SurfaceControl to the callback.

    // The client side keeps a sp<> to the SurfaceControl so if the SurfaceControl has been

    // destroyed the client side is dead and there won't be anyone to send the callback to.

    sp<IBinder> surfaceControl = handle->surfaceControl.promote();

    if (surfaceControl) {

        transactionStats->surfaceStats.emplace_back(surfaceControl, handle->acquireTime,

                                                    handle->previousReleaseFence);

                                                    handle->previousReleaseFence);

    }

    return NO_ERROR;

    return NO_ERROR;

}

}

services/surfaceflinger/TransactionCompletedThread.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ public: 




    sp<ITransactionCompletedListener> listener;

    sp<ITransactionCompletedListener> listener;

    std::vector<CallbackId> callbackIds;

    std::vector<CallbackId> callbackIds;

    sp<IBinder> surfaceControl;

    wp<IBinder> surfaceControl;





    bool releasePreviousBuffer = false;

    bool releasePreviousBuffer = false;

    sp<Fence> previousReleaseFence;

    sp<Fence> previousReleaseFence;