diff options
| author | 2024-01-08 05:53:25 +0000 | |
|---|---|---|
| committer | 2024-01-08 05:53:25 +0000 | |
| commit | c9f4111cc40ef52b959786b8444d53db2a44dc65 (patch) | |
| tree | 1fea658a845186cefd7d7fb9f0c596f5a72a2301 | |
| parent | fa892b02224909b242d492d87702d439f1f97ae1 (diff) | |
| parent | c26caf0eb039eea87b8d73bc5c2084098dac7cb4 (diff) | |
Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index e51afbe20717..0bc60cd8efb5 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 @@ class Task extends TaskFragment { } if (top.isAttached()) { top.setWindowingMode(WINDOWING_MODE_UNDEFINED); + top.mWaitForEnteringPinnedMode = false; } } |