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

Commit c8df2c85 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: 2c1f96e0 am: f3c4d2bc

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



Change-Id: I925e3e51cc5c66db722df15cc140739110518965
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74fe8019 f3c4d2bc

libs/gui/WindowInfosListenerReporter.cpp

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

    {

        std::scoped_lock lock(mListenersMutex);

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

            return status;

        }



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

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

            status = statusTFromBinderStatus(s);