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

Commit ee1d0992 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "The binder die callback should add the wms global lock." into main am:...

Merge "The binder die callback should add the wms global lock." into main am: b96be79e am: b5f7b804

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



Change-Id: I2e107f5a6c4180886c69bbddf5986ad64e3c8179
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 797a1a97 b5f7b804
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -732,8 +732,14 @@ public class WindowManagerService extends IWindowManager.Stub
            new WallpaperVisibilityListeners();

    IDisplayChangeWindowController mDisplayChangeController = null;
    private final DeathRecipient mDisplayChangeControllerDeath =
            () -> mDisplayChangeController = null;
    private final DeathRecipient mDisplayChangeControllerDeath = new DeathRecipient() {
        @Override
        public void binderDied() {
            synchronized (mGlobalLock) {
                mDisplayChangeController = null;
            }
        }
    };

    final DisplayWindowListenerController mDisplayNotificationController;
    final TaskSystemBarsListenerController mTaskSystemBarsListenerController;