| commit | e9b753a0aaae133401b328f7288c16358d24d704 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Aug 14 03:43:46 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 14 03:43:46 2024 +0000 |
| tree | 671a1ceae06523d6a4e15134e74aaf95c0e558e0 | |
| parent | 615caa4d42a829e619e6a04dea2aea11b7e231b7 [diff] | |
| parent | b90b46a543cac12c0025dc5639ad52410fc51d6e [diff] |
Merge "Fix the activity windowingmode error of exiting pip" into main am: b90b46a543 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2891431 Change-Id: Ic841eb4fdcb0229565ef9ca63828be2373c9b6f3 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 ecf4f73..728f739 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java
@@ -4771,6 +4771,9 @@ mTransitionController.collect(topActivity); final Task lastParentBeforePip = topActivity.getLastParentBeforePip(); + // Reset the activity windowing mode to match the parent. + topActivity.getRequestedOverrideConfiguration() + .windowConfiguration.setWindowingMode(WINDOWING_MODE_UNDEFINED); topActivity.reparent(lastParentBeforePip, lastParentBeforePip.getChildCount() /* top */, "movePinnedActivityToOriginalTask");