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

Commit b4206126 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use existing bounds when pinning an activity if there is already pinned stack" into nyc-dev

parents 9cb7652f 132daa96
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -7340,9 +7340,11 @@ public final class ActivityManagerService extends ActivityManagerNative
                            + "Picture-In-Picture not supported for r=" + r);
                }
                // Use the default launch bounds for pinned stack if it doesn't exist yet.
                final Rect bounds = (mStackSupervisor.getStack(PINNED_STACK_ID) == null)
                        ? mDefaultPinnedStackBounds : null;
                // Use the default launch bounds for pinned stack if it doesn't exist yet or use the
                // current bounds.
                final ActivityStack pinnedStack = mStackSupervisor.getStack(PINNED_STACK_ID);
                final Rect bounds = (pinnedStack != null)
                        ? pinnedStack.mBounds : mDefaultPinnedStackBounds;
                mStackSupervisor.moveActivityToPinnedStackLocked(
                        r, "enterPictureInPictureMode", bounds);