From 8bba3b664e7ae0dbfeb009c3915abffc97a09d6c Mon Sep 17 00:00:00 2001
From: Patrick Williams <pdwilliams@google.com>
Date: Mon, 6 Mar 2023 09:28:53 -0600
Subject: [PATCH] Unregister WindowInfosListener in finalizer

Bug: 263311858
Test: presubmits

Change-Id: I8497c698a83289f19f9362903721371f801c76bf
---
 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..850755a62fa6b 100644
--- a/core/jni/android_window_WindowInfosListener.cpp
+++ b/core/jni/android_window_WindowInfosListener.cpp
@@ -134,6 +134,7 @@ jlong nativeCreate(JNIEnv* env, jclass clazz, jobject obj) {
 
 void destroyNativeService(void* ptr) {
     WindowInfosListener* listener = reinterpret_cast<WindowInfosListener*>(ptr);
+    SurfaceComposerClient::getDefault()->removeWindowInfosListener(listener);
     listener->decStrong((void*)nativeCreate);
 }