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

Commit 1de67c4d authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class" into nyc-dev am: 12a722e5 

am: 1fdbd81b

* commit '1fdbd81b':
  Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class

Change-Id: I48a810edda0c84292b2d641ceb20aba4fa7993e5
parents 2c4ff2e7 1fdbd81b

core/java/android/view/animation/Animation.java

+7 −3
Original line number Diff line number Diff line
@@ -93,8 +93,12 @@ public abstract class Animation implements Cloneable { 
     */

    public static final int ZORDER_BOTTOM = -1;



    private static final boolean USE_CLOSEGUARD

    // Use a preload holder to isolate static initialization into inner class, which allows

    // Animation and its subclasses to be compile-time initialized.

    private static class NoImagePreloadHolder {

        public static final boolean USE_CLOSEGUARD

                = SystemProperties.getBoolean("log.closeguard.Animation", false);

    }



    /**

     * Set by {@link #getTransformation(long, Transformation)} when the animation ends.
@@ -859,7 +863,7 @@ public abstract class Animation implements Cloneable { 
            if (!mStarted) {

                fireAnimationStart();

                mStarted = true;

                if (USE_CLOSEGUARD) {

                if (NoImagePreloadHolder.USE_CLOSEGUARD) {

                    guard.open("cancel or detach or getTransformation");

                }

            }