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

Commit 4f67ac89 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 am: e9b753a0 

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



Change-Id: Id7a88474f038c3a2cf71df666291375ad1536c1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32003848 e9b753a0

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

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