Merge "Make sure keyguard unlock resets pip corners" into udc-qpr-dev am: 8d9d2cc23d am: 9e3c27428d

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

Change-Id: I19785d5815a5f28442f4daa4a936f4f0b7bc1af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java
index 226fe08a2f19..451e61855943 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java
@@ -345,6 +345,8 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler,
                     // Keyguard handler cannot handle it, process through original mixed
                     mActiveTransitions.remove(keyguardMixed);
                 }
+            } else if (mPipHandler != null) {
+                mPipHandler.syncPipSurfaceState(info, startTransaction, finishTransaction);
             }
         }