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

Commit b5f7b804 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: b96be79e 

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



Change-Id: Ib7b93804805722be97fc7c8d46dac2807fb4fdfd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aacab183 b96be79e

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

+8 −2
Original line number Diff line number Diff line
@@ -723,8 +723,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;