| commit | b52340e20316f719c2f447e1f55f1bbb4a00fcb8 | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Mon Jan 08 12:50:57 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 08 12:50:57 2024 +0000 |
| tree | 74c4e0a354f5ab311f89c662a7c469aabb186169 | |
| parent | c13279eca103742b882a1a57f3572a04e9b7240e [diff] | |
| parent | f07e3f28018a0aa7073789def23bd7975c098d89 [diff] |
Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main am: c9f4111cc4 am: f07e3f2801 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2897000 Change-Id: I7c552921bb58734ae4a8c71064d8c3db945c5446 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index e51afbe..0bc60cd 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java
@@ -4708,6 +4708,7 @@ } if (top.isAttached()) { top.setWindowingMode(WINDOWING_MODE_UNDEFINED); + top.mWaitForEnteringPinnedMode = false; } }