diff options
| author | 2022-12-02 21:54:20 +0000 | |
|---|---|---|
| committer | 2022-12-02 21:54:20 +0000 | |
| commit | ae4bee73595a56c1dcac3abd50b9da8872d5d1f8 (patch) | |
| tree | fc42024f0cec5aae16eed19617129eb04c186310 | |
| parent | 0ec9c69aa5bb51cd0fa8cfeef24c6bcbb8f8175d (diff) | |
| parent | 8fd663fbe7b5b39a6b5984979e12daf7302e08c3 (diff) | |
Merge "Create window decors for leaf tasks & skip non-leafs" into tm-qpr-dev am: 5c3b3d0ac5 am: 8fd663fbe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20583356
Change-Id: Ib4ef611aec65a483ecbf6a3698629777a61e27f5
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.java | 2 |
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; |