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

Commit 515fa947 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix deadlock between WMG and WMS" into sc-dev am: 6acca065 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf7e6181077edff7d7e888688859e62e832a1689
parents 23b5d89a 6acca065

core/java/android/app/WindowTokenClient.java

+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");

        });

    }

}