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

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

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



Change-Id: I81b8a8844276674322dfb96102920a1c3b20e1fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b643c59b 2c1f96e0

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);