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

Commit 6044f8df 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 stack" into nyc-dev 

am: b4206126

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

Change-Id: Id6f6c7b2b4eb8262e5344d914d3024996191d87d
parents 798a860e b4206126

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