summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wei Sheng Shih <wilsonshih@google.com> 2024-10-17 08:48:41 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-10-17 08:48:41 +0000
commita854e4c812be83559226b5993ea5e5ec8ba2fd06 (patch)
tree763328726229db709c17fa70e9332aee8748e678
parent9d591c90174bf0ac92d5f02fbe03490ead3c9db2 (diff)
parent05ea960d877c3f186024ec768b0c750e6709a50a (diff)
Merge "Fix task cannot exit split if the app is request for moveTaskToBack" into main
-rw-r--r--services/core/java/com/android/server/wm/Task.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 7b270842b3c5..cbf6c5a02ae3 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -5807,9 +5807,9 @@ class Task extends TaskFragment {
}
private boolean canMoveTaskToBack(Task task) {
- // Checks whether a task is a child of this task because it can be reparetned when
+ // Checks whether a task is a child of this task because it can be reparented when
// transition is deferred.
- if (task != this && task.getParent() != this) {
+ if (task != this && !task.isDescendantOf(this)) {
return false;
}