Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d036331f authored by Evan Rosky's avatar Evan Rosky
Browse files

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
parent b19aa988

services/core/java/com/android/server/wm/Task.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

            }

        }