Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9b753a0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the activity windowingmode error of exiting pip" into main am: b90b46a5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2891431



Change-Id: Ic841eb4fdcb0229565ef9ca63828be2373c9b6f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 615caa4d b90b46a5

services/core/java/com/android/server/wm/Task.java

+3 −0
Original line number Diff line number Diff line
@@ -4771,6 +4771,9 @@ class Task extends TaskFragment { 
                    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");