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

Commit b90b46a5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 7c538b63 8516c254

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

+3 −0
Original line number Diff line number Diff line
@@ -4772,6 +4772,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");