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

Commit 8753ef15 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Revert^2 "Reduce extra invocation of ThreadLocal in AnimationHandler" 

It can return the non-null obtained instance directly.

Unfortunately, ThreadLocal.withInitial and override initialValue
may not be suitable to use, because getAnimationCount may not want
to create the instance.
Some special builds may insert generated code in constructor to
evaluate code coverage. And it may perform I/O operations that
violate StrictMode, and then StrictMode invokes
getCurrentAnimationsCount for dump, which accesses the ThreadLocal
and triggers initialization again. That leads to endless recursion.

Bug: 163976519
Flag: EXEMPT simple refactor
Test: atest ValueAnimatorTests
Change-Id: Id6e30e28279df8ac68b906afd2f59609e2568730
parent 8ddbaf6a

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;

    }



    /**