1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/animation/AnimationHandler.java b/core/java/android/animation/AnimationHandler.java
index a97dc737dd99..d84a4c12a2cd 100644
--- a/core/java/android/animation/AnimationHandler.java
+++ b/core/java/android/animation/AnimationHandler.java
@@ -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();
     }