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

Commit 585c387f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ShellRoot: Hold lock during binder death." into rvc-dev am: dbc5e64b 

Change-Id: Ic853c2b4c810994a6d52d93a77fd79e71c689fac
parents 6d0764ec dbc5e64b

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

+7 −5
Original line number Diff line number Diff line
@@ -1106,6 +1106,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
    }



    void removeShellRoot(int windowType) {

        synchronized(mWmService.mGlobalLock) {

            ShellRoot root = mShellRoots.get(windowType);

            if (root == null) {

                return;
@@ -1113,6 +1114,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            root.clear();

            mShellRoots.remove(windowType);

        }

    }



    void setRemoteInsetsController(IDisplayWindowInsetsController controller) {

        if (mRemoteInsetsControlTarget != null) {