| commit | 602299984108e26cf1b881c7ecbeb5194e0cfa8f | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Mon Jan 08 13:39:51 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 08 13:39:51 2024 +0000 |
| tree | 7232f87612d03110471e13d0a32fdb331cc51457 | |
| parent | e4584f38917b5500e0f6f6afd88be59b4bd0df7a [diff] | |
| parent | b52340e20316f719c2f447e1f55f1bbb4a00fcb8 [diff] |
Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main am: c9f4111cc4 am: f07e3f2801 am: b52340e203 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2897000 Change-Id: Ic6245f83e5420552a7ab2ca71f7637ae216b29a1 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 d556f09..03e263a 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java
@@ -4784,6 +4784,7 @@ } if (top.isAttached()) { top.setWindowingMode(WINDOWING_MODE_UNDEFINED); + top.mWaitForEnteringPinnedMode = false; } }