From af0979cd401ff920f4469c8a1a85bb37749b4381 Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Thu, 3 Jun 2021 13:07:01 +0800 Subject: [PATCH] Fix freeform task surface is not shown Commit d3bdc63 reuse canBeOrganized to decide whether to show task surface on creation. But canBeOrganized doesn't check supported type that causes the surface of freeform (unsupported type) task not to show. Bug: 185400889 Test: Enable freeform in developer options. Enter recents and select freeform. The task should be visible. Change-Id: Id534918998acf2a3c1f8c9b97fb9c8fb6b386996 --- services/core/java/com/android/server/wm/Task.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 04a37d39839b1..82d1c04591a6d 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -4967,7 +4967,8 @@ class Task extends WindowContainer { } private boolean canBeOrganized() { - if (mForceNotOrganized) { + if (mForceNotOrganized || !mAtmService.mTaskOrganizerController + .isSupportedWindowingMode(getWindowingMode())) { return false; } // All root tasks can be organized