summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-12-02 21:22:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-02 21:22:00 +0000
commit8fd663fbe7b5b39a6b5984979e12daf7302e08c3 (patch)
tree43699afa49cfbfa52ade8dfa3ddda2b9ae080caf
parent4a89d9b9568afa16ac7f84e744aff646a882c94d (diff)
parent5c3b3d0ac529b710bf7dfec1c04aa1363397138c (diff)
Merge "Create window decors for leaf tasks & skip non-leafs" into tm-qpr-dev am: 5c3b3d0ac5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20583356 Change-Id: I9111354a6df7edb58e1a3cba0e05b46103149213 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java
index 6e710f7caeda..60e5ff27cab9 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java
@@ -90,7 +90,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs
// This logic relies on 2 assumptions: 1 is that child tasks will be visited before
// parents (due to how z-order works). 2 is that no non-tasks are interleaved
// between tasks (hierarchically).
- taskParents.add(change.getContainer());
+ taskParents.add(change.getParent());
}
if (taskParents.contains(change.getContainer())) {
continue;