Merge "Unlink death recipient which references to DisplayContent" into tm-qpr-dev am: 8bfc996c7b am: 5cd5175f30

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19751500

Change-Id: I6a602a9e0b03bacf1f7275a02a3d89a433803a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-08-30 07:21:28 +00:00
committed by Automerger Merge Worker

View File

@@ -3188,8 +3188,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
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);