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

2021-06-03 06:47:44 +00:00
parent eda0e624c8 af0979cd40
commit bb3fa41e60
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
@@ -4967,7 +4967,8 @@ class Task extends WindowContainer<WindowContainer> {
    }

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