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

Commit 352be20d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix race between AnimationListener and DragState"

parents 593f56cc 971fe912

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

+5 −5
Original line number Diff line number Diff line
@@ -645,15 +645,15 @@ class DragState { 
            try (final SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()) {

                transaction.setPosition(

                        mSurfaceControl,

                        (float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_X),

                        (float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_Y));

                        (float) animation.getAnimatedValue(ANIMATED_PROPERTY_X),

                        (float) animation.getAnimatedValue(ANIMATED_PROPERTY_Y));

                transaction.setAlpha(

                        mSurfaceControl,

                        (float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_ALPHA));

                        (float) animation.getAnimatedValue(ANIMATED_PROPERTY_ALPHA));

                transaction.setMatrix(

                        mSurfaceControl,

                        (float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_SCALE), 0,

                        0, (float) mAnimator.getAnimatedValue(ANIMATED_PROPERTY_SCALE));

                        (float) animation.getAnimatedValue(ANIMATED_PROPERTY_SCALE), 0,

                        0, (float) animation.getAnimatedValue(ANIMATED_PROPERTY_SCALE));

                transaction.apply();

            }

        }