Merge "Fix a bug in drop region." into rvc-dev

2020-06-23 21:26:59 +00:00
parent 58bb12f7f8 d036331f3b
commit aa30a27623
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -2934,7 +2934,7 @@ class Task extends WindowContainer<WindowContainer> {
            final Task rootTask = getRootTask();
            final Task topNonOrgTask =
                    rootTask.mCreatedByOrganizer ? rootTask.getTopMostTask() : rootTask;
-            if (isDescendantOf(topNonOrgTask)) {
+            if (this == topNonOrgTask || isDescendantOf(topNonOrgTask)) {
                return false;
            }
        }