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

Commit 2bc9c50a 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: 85795340 

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



Change-Id: I4143b247fac548ad24df4a1672f7057d1243dc03
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42ff7bd5 85795340

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