commit 8bfc996c7bad3fbe518a77e680e2fb4cb556a9b7
author Riddle Hsu <riddlehsu@google.com> Tue Aug 30 06:28:36 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 30 06:28:36 2022 +0000
tree 4e42d4d9d818e5f36857de70e3fc87ee8a8b6415
parent 16219f2ea4ca3e1164d6de44a8c3e6e7ec30c119
parent 08eae598a8c46291bae58dc0bff7d8ee1637a844

Merge "Unlink death recipient which references to DisplayContent" into tm-qpr-dev

services/core/java/com/android/server/wm/DisplayContent.java

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 0376974..b64409c 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -3176,8 +3176,12 @@
             if (DEBUG_DISPLAY) Slog.v(TAG_WM, "Removing display=" + this);
             mPointerEventDispatcher.dispose();
             setRotationAnimation(null);
+            // Unlink death from remote to clear the reference from binder -> mRemoteInsetsDeath
+            // -> this DisplayContent.
+            setRemoteInsetsController(null);
             mWmService.mAnimator.removeDisplayLocked(mDisplayId);
             mOverlayLayer.release();
+            mWindowingLayer.release();
             mInputMonitor.onDisplayRemoved();
             mWmService.mDisplayNotificationController.dispatchDisplayRemoved(this);
             mWmService.mAccessibilityController.onDisplayRemoved(mDisplayId);