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

Commit c30fe2cc authored by ztenghui's avatar ztenghui Committed by Android Git Automerger
Browse files

am 6bdc2e08: am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 

* commit '6bdc2e08b712f147e5aeec39afded3d723b8426c':
  Fix AVD for CTS failure.
parents d7f6d178 e44af7d3

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

+9 −2
Original line number Diff line number Diff line
@@ -137,8 +137,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { 
    private boolean mMutated;



    public AnimatedVectorDrawable() {

        mAnimatedVectorState = new AnimatedVectorDrawableState(

                new AnimatedVectorDrawableState(null));

        mAnimatedVectorState = new AnimatedVectorDrawableState(null);

    }



    private AnimatedVectorDrawable(AnimatedVectorDrawableState state, Resources res,
@@ -160,9 +159,15 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { 


    @Override

    public ConstantState getConstantState() {

        mAnimatedVectorState.mChangingConfigurations = getChangingConfigurations();

        return mAnimatedVectorState;

    }



    @Override

    public int getChangingConfigurations() {

        return super.getChangingConfigurations() | mAnimatedVectorState.mChangingConfigurations;

    }



    @Override

    public void draw(Canvas canvas) {

        mAnimatedVectorState.mVectorDrawable.draw(canvas);
@@ -347,6 +352,8 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { 
                        mTargetNameMap.put(animClone, targetName);

                    }

                }

            } else {

                mVectorDrawable = new VectorDrawable();

            }

        }