diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 07f7e29876d6..c4d50cbbb280 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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); |