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

Commit 0b71efbc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check for stackBounds nullness in showMenu."

parents eb0ae6c2 e06266d9

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -280,7 +280,9 @@ public class PipMenuActivityController { 
        if (mToActivityMessenger != null) {

        if (mToActivityMessenger != null) {

            Bundle data = new Bundle();

            Bundle data = new Bundle();

            data.putInt(EXTRA_MENU_STATE, menuState);

            data.putInt(EXTRA_MENU_STATE, menuState);

            if (stackBounds != null) {

                data.putParcelable(EXTRA_STACK_BOUNDS, stackBounds);

                data.putParcelable(EXTRA_STACK_BOUNDS, stackBounds);

            }

            data.putParcelable(EXTRA_MOVEMENT_BOUNDS, movementBounds);

            data.putParcelable(EXTRA_MOVEMENT_BOUNDS, movementBounds);

            data.putBoolean(EXTRA_ALLOW_TIMEOUT, allowMenuTimeout);

            data.putBoolean(EXTRA_ALLOW_TIMEOUT, allowMenuTimeout);

            data.putBoolean(EXTRA_WILL_RESIZE_MENU, willResizeMenu);

            data.putBoolean(EXTRA_WILL_RESIZE_MENU, willResizeMenu);