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

Commit 5f7c6992 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: Iec044b4cc788a2b8dbd9af0a70533d3a639d0f9a
parents d12ceb4d b4206126

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -7340,9 +7340,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
                            + "Picture-In-Picture not supported for r=" + r);

                            + "Picture-In-Picture not supported for r=" + r);

                }

                }

















                // Use the default launch bounds for pinned stack if it doesn't exist yet.







                // Use the default launch bounds for pinned stack if it doesn't exist yet or use the











                final Rect bounds = (mStackSupervisor.getStack(PINNED_STACK_ID) == null)







                // current bounds.











                        ? mDefaultPinnedStackBounds : null;







                final ActivityStack pinnedStack = mStackSupervisor.getStack(PINNED_STACK_ID);














                final Rect bounds = (pinnedStack != null)














                        ? pinnedStack.mBounds : mDefaultPinnedStackBounds;



























                mStackSupervisor.moveActivityToPinnedStackLocked(







                mStackSupervisor.moveActivityToPinnedStackLocked(











                        r, "enterPictureInPictureMode", bounds);







                        r, "enterPictureInPictureMode", bounds);