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

Commit be4a808b authored by Winson Chung's avatar Winson Chung
Browse files

Fix issue where we weren't dismissing the pip menu activity. 

- Also don't crash if we get a deferred call to resize the pinned stack
  that no longer exists.

Bug: 36049843
Test: Try to pinch and expand pip
Change-Id: I64c42e47c466c641464c4f22a20bded2209e29eb
parent c59a2a76

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ public class PipTouchHandler implements TunerService.Tunable { 
                mMenuController.showMenu(MENU_STATE_FULL, mMotionHelper.getBounds(),

                        mMovementBounds, true /* allowMenuTimeout */);

            } else {

                mMenuController.hideMenu();

                mMotionHelper.expandPip();

            }

            return true;

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

+4 −2
Original line number Diff line number Diff line
@@ -10506,8 +10506,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    if (stackId == PINNED_STACK_ID) {

                        final PinnedActivityStack pinnedStack =

                                mStackSupervisor.getStack(PINNED_STACK_ID);

                        pinnedStack.animateResizePinnedStack(null /* sourceBounds */, destBounds,

                                animationDuration);

                        if (pinnedStack != null) {

                            pinnedStack.animateResizePinnedStack(null /* sourceBounds */,

                                    destBounds, animationDuration);

                        }

                    } else {

                        throw new IllegalArgumentException("Stack: " + stackId

                                + " doesn't support animated resize.");