commit e379b5a22aa0f5b1f43fc98b0c9962fe63a4a2d3
author Patrick Williams <pdwilliams@google.com> Mon Mar 06 09:30:08 2023 -0600
committer Patrick Williams <pdwilliams@google.com> Mon Mar 06 10:07:58 2023 -0600
tree df1c7c5b6327a3f184baed5b4e2b7c5168450b38
parent 5d09a038a34e604e2b0c847a59b5a60525480aee

Check if WindowInfosListener is present during remove

This reverts commit 4854af5fa5c713ddfefad8770b3cb9e7ae0a494f.

Bug: 263311858
Test: presubmits
Change-Id: I1e53499745117fce80435fdf40e66efc55147bf9

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