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

Commit 64b317d7 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 

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



Change-Id: Ia6d11b2da1a7c339797013fc3ac8c89c530d1bf1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ac428af 264de2e9

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,