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

Commit dd289a8f authored by Patrick Williams's avatar Patrick Williams Committed by Automerger Merge Worker
Browse files

Merge "Check if WindowInfosListener is present during remove" into udc-dev am:... 

Merge "Check if WindowInfosListener is present during remove" into udc-dev am: 85795340 am: d570a2a1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21756542



Change-Id: I29297a021d3c5844a6130e5c1892d9dcb36a3d43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0126ad2 d570a2a1

libs/gui/WindowInfosListenerReporter.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,10 @@ status_t WindowInfosListenerReporter::removeWindowInfosListener( 
    status_t status = OK;

    status_t status = OK;

    {

    {

        std::scoped_lock lock(mListenersMutex);

        std::scoped_lock lock(mListenersMutex);

        if (mWindowInfosListeners.find(windowInfosListener) == mWindowInfosListeners.end()) {

            return status;

        }



        if (mWindowInfosListeners.size() == 1) {

        if (mWindowInfosListeners.size() == 1) {

            binder::Status s = surfaceComposer->removeWindowInfosListener(this);

            binder::Status s = surfaceComposer->removeWindowInfosListener(this);

            status = statusTFromBinderStatus(s);

            status = statusTFromBinderStatus(s);