Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ifc81ac64614b910ae4cc4a52fc9b228c75120697
This commit is contained in:
Evan Rosky
2020-06-23 21:32:01 +00:00
committed by Automerger Merge Worker
parent 8af7e4a68f aa30a27623
commit 4f999ac0f8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/Task.java
View File

@@ -2934,7 +2934,7 @@ class Task extends WindowContainer<WindowContainer> {
final Task rootTask = getRootTask(); final Task rootTask = getRootTask();
final Task topNonOrgTask = final Task topNonOrgTask =
rootTask.mCreatedByOrganizer ? rootTask.getTopMostTask() : rootTask; rootTask.mCreatedByOrganizer ? rootTask.getTopMostTask() : rootTask;
if (isDescendantOf(topNonOrgTask)) { if (this == topNonOrgTask || isDescendantOf(topNonOrgTask)) {
return false; return false;
} }
} }