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

Commit 8b5c523e authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Use existing bounds when pinning an activity if there is already pinned... 

Merge "Use existing bounds when pinning an activity if there is already pinned stack" into nyc-dev am: b4206126
am: 5f7c6992

* commit '5f7c6992':
  Use existing bounds when pinning an activity if there is already pinned stack

Change-Id: I261c251cb00cb54d4749d1ec16136de30afb9f3f
parents d6c23254 5f7c6992

services/core/java/com/android/server/am/ActivityManagerService.java

+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);