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

Commit 30c77477 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 am: 35a365c7... 

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

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

Change-Id: Ic99b195ee1e9655b22a38b401cc8f42e881404f6
parents b73b8352 13816464

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

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

            }

        }