Merge "Fix the round corner and crop issue after auto-enter-pip" into sc-dev am: 4f2967f788 am: 6b8859a0a6

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

Change-Id: I40d4dc10794410c2c9f5e5afe89f82e6f41a1caa

services/core/java/com/android/server/wm/Task.java

@@ -5942,9 +5942,9 @@ class Task extends TaskFragment {
         mLastRecentsAnimationTransaction = null;
         mLastRecentsAnimationOverlay = null;
         // reset also the crop and transform introduced by mLastRecentsAnimationTransaction
-        Rect bounds = getBounds();
         getPendingTransaction().setMatrix(mSurfaceControl, Matrix.IDENTITY_MATRIX, new float[9])
-                .setWindowCrop(mSurfaceControl, bounds.width(), bounds.height());
+                .setWindowCrop(mSurfaceControl, null)
+                .setCornerRadius(mSurfaceControl, 0);
     }
 
     void maybeApplyLastRecentsAnimationTransaction() {