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	Original line	Diff line number	Diff line
	@@ -137,8 +137,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable {
	private boolean mMutated;		private boolean mMutated;

	public AnimatedVectorDrawable() {		public AnimatedVectorDrawable() {
	mAnimatedVectorState = new AnimatedVectorDrawableState(		mAnimatedVectorState = new AnimatedVectorDrawableState(null);
	new AnimatedVectorDrawableState(null));
	}		}

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

	@Override		@Override
	public ConstantState getConstantState() {		public ConstantState getConstantState() {
			mAnimatedVectorState.mChangingConfigurations = getChangingConfigurations();
	return mAnimatedVectorState;		return mAnimatedVectorState;
	}		}

			@Override
			public int getChangingConfigurations() {
			return super.getChangingConfigurations() \| mAnimatedVectorState.mChangingConfigurations;
			}

	@Override		@Override
	public void draw(Canvas canvas) {		public void draw(Canvas canvas) {
	mAnimatedVectorState.mVectorDrawable.draw(canvas);		mAnimatedVectorState.mVectorDrawable.draw(canvas);
	@@ -347,6 +352,8 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable {
	mTargetNameMap.put(animClone, targetName);		mTargetNameMap.put(animClone, targetName);
	}		}
	}		}
			} else {
			mVectorDrawable = new VectorDrawable();
	}		}
	}		}