From d036331f3bc3aa4befe3f1669e9e61309b9d5c8d Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Tue, 23 Jun 2020 09:42:39 -0700
Subject: [PATCH] Fix a bug in drop region.

isDescendantOf doesn't check equality, so add that

Bug: 154832406
Test: Put app in split-primary, open launcher search and drag
      app icon into top part of launcher
Change-Id: I737f4b2db88599e28ba8852341bbe37ae38c1239
---
 services/core/java/com/android/server/wm/Task.java | 2 +-
 1 file changed, 1 insertion(+), 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 fec484935d681..97357839f02d6 100644
--- 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;
             }
         }