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

Commit 6acca065 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix deadlock between WMG and WMS" into sc-dev

parents 6d33ff7f 045230a4
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -85,8 +85,10 @@ public class WindowTokenClient extends IWindowToken.Stub {
            context.destroy();
            mContextRef.clear();
        }
        // If a secondary display is detached, release all views attached to this token.
        WindowManagerGlobal.getInstance().closeAll(this, mContextRef.getClass().getName(),
                "WindowContext");
        ActivityThread.currentActivityThread().getHandler().post(() -> {
            // If the tracked window token is detached, release all views attached to this token.
            WindowManagerGlobal.getInstance().closeAll(WindowTokenClient.this,
                    "#onWindowTokenRemoved()", "WindowTokenClient");
        });
    }
}