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

Commit db88eb60 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11972638

Change-Id: I95dded9658d67eec79b0e44cade1a53c0c827ead
parents fe384dbf aa30a276

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;

            }

        }