Merge "Fix AVD for CTS failure." into lmp-dev (dde35339) · Commits · e / os / android_frameworks_base

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();
		}
		}