commit 12a722e56936853c880a20026057020d2a4252dc
author Andreas Gampe <agampe@google.com> Wed Apr 06 22:45:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 06 22:45:36 2016 +0000
tree 2f3846499af6624209879e02188dbdea570f5829
parent ee94486742fe21ca23852bdd3cd7a13bb9363056
parent 56c560a9dd0197d85c7ba95d5c8bb8e8fd3c3fee

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

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

diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java
index 1536c29..d89c172 100644
--- a/core/java/android/view/animation/Animation.java
+++ b/core/java/android/view/animation/Animation.java
@@ -93,8 +93,12 @@
      */
     public static final int ZORDER_BOTTOM = -1;
 
-    private static final boolean USE_CLOSEGUARD
-            = SystemProperties.getBoolean("log.closeguard.Animation", false);
+    // 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 @@
             if (!mStarted) {
                 fireAnimationStart();
                 mStarted = true;
-                if (USE_CLOSEGUARD) {
+                if (NoImagePreloadHolder.USE_CLOSEGUARD) {
                     guard.open("cancel or detach or getTransformation");
                 }
             }