Merge "Revert "Reduce extra invocation of ThreadLocal in AnimationHandler"" into main (d60188b2) · Commits · e / os / android_frameworks_base

core/java/android/animation/AnimationHandler.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -110,8 +110,7 @@ public class AnimationHandler {
		}
		};

		public static final ThreadLocal<AnimationHandler> sAnimatorHandler =
		ThreadLocal.withInitial(AnimationHandler::new);
		public final static ThreadLocal<AnimationHandler> sAnimatorHandler = new ThreadLocal<>();
		private static AnimationHandler sTestHandler = null;
		private boolean mListDirty = false;

		@@ -119,6 +118,9 @@ public class AnimationHandler {
		if (sTestHandler != null) {
		return sTestHandler;
		}
		if (sAnimatorHandler.get() == null) {
		sAnimatorHandler.set(new AnimationHandler());
		}
		return sAnimatorHandler.get();
		}