Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67c25c90 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Reduce extra invocation of ThreadLocal in AnimationHandler"" into main

parents 92cbf2b2 8753ef15

core/java/android/animation/AnimationHandler.java

+6 −4
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class AnimationHandler { 
        }

    };



    public final static ThreadLocal<AnimationHandler> sAnimatorHandler = new ThreadLocal<>();

    public static final ThreadLocal<AnimationHandler> sAnimatorHandler = new ThreadLocal<>();

    private static AnimationHandler sTestHandler = null;

    private boolean mListDirty = false;
@@ -118,10 +118,12 @@ public class AnimationHandler { 
        if (sTestHandler != null) {

            return sTestHandler;

        }

        if (sAnimatorHandler.get() == null) {

            sAnimatorHandler.set(new AnimationHandler());

        AnimationHandler animatorHandler = sAnimatorHandler.get();

        if (animatorHandler == null) {

            animatorHandler = new AnimationHandler();

            sAnimatorHandler.set(animatorHandler);

        }

        return sAnimatorHandler.get();

        return animatorHandler;

    }



    /**