Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Id3c1bc11063ac1c7a0acbd719c8c41504a5c0c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-08-30 06:51:58 +00:00
committed by Automerger Merge Worker
parent 71c8f97842 8bfc996c7b
commit 5cd5175f30
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -3176,8 +3176,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
if (DEBUG_DISPLAY) Slog.v(TAG_WM, "Removing display=" + this); if (DEBUG_DISPLAY) Slog.v(TAG_WM, "Removing display=" + this);
mPointerEventDispatcher.dispose(); mPointerEventDispatcher.dispose();
setRotationAnimation(null); setRotationAnimation(null);
// Unlink death from remote to clear the reference from binder -> mRemoteInsetsDeath
// -> this DisplayContent.
setRemoteInsetsController(null);
mWmService.mAnimator.removeDisplayLocked(mDisplayId); mWmService.mAnimator.removeDisplayLocked(mDisplayId);
mOverlayLayer.release(); mOverlayLayer.release();
mWindowingLayer.release();
mInputMonitor.onDisplayRemoved(); mInputMonitor.onDisplayRemoved();
mWmService.mDisplayNotificationController.dispatchDisplayRemoved(this); mWmService.mDisplayNotificationController.dispatchDisplayRemoved(this);
mWmService.mAccessibilityController.onDisplayRemoved(mDisplayId); mWmService.mAccessibilityController.onDisplayRemoved(mDisplayId);