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

Commit ee0909ca authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Do not change the leash after completion" into udc-dev am: 264de2e9 am: ad78b449 

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



Change-Id: Ifbb5e29b667e9492c8cf234d11d8b26c7972ddd2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40245d32 ad78b449

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

+3 −2
Original line number Diff line number Diff line
@@ -308,9 +308,10 @@ public class PipTransition extends PipTransitionController { 
    @Override

    public void end() {

        Animator animator = mPipAnimationController.getCurrentAnimator();

        if (animator == null) return;

        if (animator != null && animator.isRunning()) {

            animator.end();

        }

    }



    @Override

    public boolean handleRotateDisplay(int startRotation, int endRotation,