Merge "Fix freeform task surface is not shown" into sc-dev am: bb3fa41e60

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14809875 Change-Id: I82be859b932b8ead2f2d65d67d69075a2f9cfc65
2021-06-03 07:38:53 +00:00
parent 68a3f51f23 bb3fa41e60
commit 26ffc71db1
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -4714,7 +4714,8 @@ class Task extends TaskFragment {
    }

    private boolean canBeOrganized() {
-        if (mForceNotOrganized) {
+        if (mForceNotOrganized || !mAtmService.mTaskOrganizerController
+                .isSupportedWindowingMode(getWindowingMode())) {
            return false;
        }
        // All root tasks can be organized