From 13670970e9e154c5aba3a0f1cff79b81344a14fd Mon Sep 17 00:00:00 2001
From: Patrick Williams <pdwilliams@google.com>
Date: Fri, 3 Mar 2023 13:39:52 -0600
Subject: [PATCH] Unregister WindowInfosListener in destructor

Bug: 263311858
Test: presubmits
Change-Id: I13c2e3a8ca5c1b0645616ba0b3222d4a4f13db3d
---
 core/jni/android_window_WindowInfosListener.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/jni/android_window_WindowInfosListener.cpp b/core/jni/android_window_WindowInfosListener.cpp
index f2cbe8abae8ba..32b85b01cdce6 100644
--- a/core/jni/android_window_WindowInfosListener.cpp
+++ b/core/jni/android_window_WindowInfosListener.cpp
@@ -118,6 +118,7 @@ struct WindowInfosListener : public gui::WindowInfosListener {
     }
 
     ~WindowInfosListener() override {
+        SurfaceComposerClient::getDefault()->removeWindowInfosListener(this);
         JNIEnv* env = AndroidRuntime::getJNIEnv();
         env->DeleteWeakGlobalRef(mListener);
     }