Merge "Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class" into nyc-dev (12a722e5) · Commits · e / os / android_frameworks_base

core/java/android/view/animation/Animation.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -93,8 +93,12 @@ public abstract class Animation implements Cloneable {
	*/		*/
	public static final int ZORDER_BOTTOM = -1;		public static final int ZORDER_BOTTOM = -1;

	private static final boolean USE_CLOSEGUARD		// Use a preload holder to isolate static initialization into inner class, which allows
			// Animation and its subclasses to be compile-time initialized.
			private static class NoImagePreloadHolder {
			public static final boolean USE_CLOSEGUARD
	= SystemProperties.getBoolean("log.closeguard.Animation", false);		= SystemProperties.getBoolean("log.closeguard.Animation", false);
			}

	/**		/**
	* Set by {@link #getTransformation(long, Transformation)} when the animation ends.		* Set by {@link #getTransformation(long, Transformation)} when the animation ends.
	@@ -859,7 +863,7 @@ public abstract class Animation implements Cloneable {
	if (!mStarted) {		if (!mStarted) {
	fireAnimationStart();		fireAnimationStart();
	mStarted = true;		mStarted = true;
	if (USE_CLOSEGUARD) {		if (NoImagePreloadHolder.USE_CLOSEGUARD) {
	guard.open("cancel or detach or getTransformation");		guard.open("cancel or detach or getTransformation");
	}		}
	}		}