Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cd5175f authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Id3c1bc11063ac1c7a0acbd719c8c41504a5c0c80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71c8f978 8bfc996c

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -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);