Merge "Remove duplicate call to update PIP bounds on PIP expand" into sc-dev am: d3cc960edf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14681779

Change-Id: I242ee2211975d8566069a56dead9656d2ff74e3e

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java

@@ -202,6 +202,7 @@ public class PhonePipMenuController implements PipMenuController {
         mSystemWindows.updateViewLayout(mPipMenuView,
                 getPipMenuLayoutParams(MENU_WINDOW_TITLE, destinationBounds.width(),
                         destinationBounds.height()));
+        updateMenuLayout(destinationBounds);
     }
 
     /**

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMotionHelper.java

@@ -684,7 +684,7 @@ public class PipMotionHelper implements PipAppOpsListener.Callback,
         // Intentionally resize here even if the current bounds match the destination bounds.
         // This is so all the proper callbacks are performed.
         mPipTaskOrganizer.scheduleAnimateResizePip(toBounds, duration,
-                TRANSITION_DIRECTION_EXPAND_OR_UNEXPAND, mUpdateBoundsCallback);
+                TRANSITION_DIRECTION_EXPAND_OR_UNEXPAND, null /* updateBoundsCallback */);
         setAnimatingToBounds(toBounds);
     }