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

Commit 853b23d1 authored by Doris Liu's avatar Doris Liu
Browse files

Fix listeners not getting called when AVD falls back on UI thread 

When AVD fall back on UI thread, in addition to transfer the pending
actions from RT animator to UI animator, we also need to transfer
the listener, if any.

BUG: 30901495
Change-Id: Ib4a7ebb2996a02596bb5789704617c894a5dd474
parent f1e87a20

graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java

+13 −4
Original line number Diff line number Diff line
@@ -244,10 +244,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { 
            // to UI thread animation for AVD.

            if (!mAnimatorSet.isRunning() &&

                    ((VectorDrawableAnimatorRT) mAnimatorSet).mPendingAnimationActions.size() > 0) {

                VectorDrawableAnimatorRT oldAnim = (VectorDrawableAnimatorRT) mAnimatorSet;

                mAnimatorSet = new VectorDrawableAnimatorUI(this);

                mAnimatorSet.init(mAnimatorSetFromXml);

                oldAnim.transferPendingActions(mAnimatorSet);

                fallbackOntoUI();

            }

        }

        mAnimatorSet.onDraw(canvas);
@@ -490,10 +487,22 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { 
                throw new UnsupportedOperationException("Cannot force Animated Vector Drawable to" +

                        " run on UI thread when the animation has started on RenderThread.");

            }

            fallbackOntoUI();

        }

    }



    private void fallbackOntoUI() {

        if (mAnimatorSet instanceof VectorDrawableAnimatorRT) {

            VectorDrawableAnimatorRT oldAnim = (VectorDrawableAnimatorRT) mAnimatorSet;

            mAnimatorSet = new VectorDrawableAnimatorUI(this);

            if (mAnimatorSetFromXml != null) {

                mAnimatorSet.init(mAnimatorSetFromXml);

            }

            // Transfer the listener from RT animator to UI animator

            if (oldAnim.mListener != null) {

                mAnimatorSet.setListener(oldAnim.mListener);

            }

            oldAnim.transferPendingActions(mAnimatorSet);

        }

    }