| commit | c9f4111cc40ef52b959786b8444d53db2a44dc65 | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Mon Jan 08 05:53:25 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jan 08 05:53:25 2024 +0000 |
| tree | 1fea658a845186cefd7d7fb9f0c596f5a72a2301 | |
| parent | fa892b02224909b242d492d87702d439f1f97ae1 [diff] | |
| parent | c26caf0eb039eea87b8d73bc5c2084098dac7cb4 [diff] |
Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main
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; } }