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

Commit 86ea4ee6 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: I409422e909c8415b51c0d9ad3507eea75316afa2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4adb9b6 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,