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

Commit 35515228 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: 6044f8df

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

Change-Id: I98e6df90aabc0f69181a581a5a4a036c68d474e0
parents bca6ffdd 6044f8df

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