commit 85795340f3b9deb44eb03e4aa498e7e14ae1522e
author Patrick Williams <pdwilliams@google.com> Fri Mar 03 22:44:14 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 03 22:44:14 2023 +0000
tree 9da5186caaab9893d1286cfe1fe71dbbbed68f54
parent d8b1c1d0237d69f2089c7be20924f8caddebc884
parent 30df05414700592d9eb0e60a6d34598034b2c052

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

libs/gui/WindowInfosListenerReporter.cpp

diff --git a/libs/gui/WindowInfosListenerReporter.cpp b/libs/gui/WindowInfosListenerReporter.cpp
index 01e865d..2b34a0f 100644
--- a/libs/gui/WindowInfosListenerReporter.cpp
+++ b/libs/gui/WindowInfosListenerReporter.cpp
@@ -62,6 +62,10 @@
     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);