Reduce extra invocation of ThreadLocal in AnimationHandler

Eliminate redundant ThreadLocal#get by using modern way to initialize.

Bug: 163976519
Flag: EXEMPT simple refactor
Test: atest ValueAnimatorTests
Change-Id: I46074627ba227e91881d49f7e77f00a0690fea75

1 files changed, 2 insertions, 4 deletions

diff --git a/core/java/android/animation/AnimationHandler.java b/core/java/android/animation/AnimationHandler.java
index d84a4c12a2cd..a97dc737dd99 100644
--- a/core/java/android/animation/AnimationHandler.java
+++ b/core/java/android/animation/AnimationHandler.java
@@ -110,7 +110,8 @@ public class AnimationHandler {
         }
     };
 
-    public final static ThreadLocal<AnimationHandler> sAnimatorHandler = new ThreadLocal<>();
+    public static final ThreadLocal<AnimationHandler> sAnimatorHandler =
+            ThreadLocal.withInitial(AnimationHandler::new);
     private static AnimationHandler sTestHandler = null;
     private boolean mListDirty = false;
 
@@ -118,9 +119,6 @@ public class AnimationHandler {
         if (sTestHandler != null) {
             return sTestHandler;
         }
-        if (sAnimatorHandler.get() == null) {
-            sAnimatorHandler.set(new AnimationHandler());
-        }
         return sAnimatorHandler.get();
     }