From 024275505d342f2970c7719d43db8aa605409f1f Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Fri, 9 Apr 2021 21:20:22 +0800 Subject: [PATCH] Remove WMG#closeAll in WindowTokenClient The non-activity window should be managed by the application itself. Framework side doesn't need to handle it. Also apps may remove the view after WMG#closeAll and cause IllegalArgumentException "not attached to window manager". Test: atest WindowContextTest Test: atest WindowContextTests WindowContextPolicyTests Bug: 183251523 Change-Id: I15ccb9a129f541f3be9733e8cd6121bb4c0fd6b8 --- core/java/android/window/WindowTokenClient.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/java/android/window/WindowTokenClient.java b/core/java/android/window/WindowTokenClient.java index b2fe4d9573f10..6abf5575d3538 100644 --- a/core/java/android/window/WindowTokenClient.java +++ b/core/java/android/window/WindowTokenClient.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.res.Configuration; import android.os.Bundle; import android.os.IBinder; -import android.view.WindowManagerGlobal; import java.lang.ref.WeakReference; @@ -94,10 +93,5 @@ public class WindowTokenClient extends IWindowToken.Stub { context.destroy(); mContextRef.clear(); } - 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"); - }); } }