Ensure FrameCallbackFaceAnimationCallback uses the UI choreographer (#…

…134)
facebookarchive · Jun 15, 2017 · 6acda2f · 6acda2f
1 parent 5eed6d0
commit 6acda2f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/...id/keyframes/src/main/java/com/facebook/keyframes/KeyframesDrawableAnimationCallback.java b/...id/keyframes/src/main/java/com/facebook/keyframes/KeyframesDrawableAnimationCallback.java
@@ -205,14 +205,13 @@ protected void advanceAnimation(final long frameTimeMillis) {
   private static class FrameCallbackFaceAnimationCallback extends KeyframesDrawableAnimationCallback
       implements Choreographer.FrameCallback {
 
-    private final Choreographer mChoreographer;
+    private static Choreographer sUIChoreographer;
 
     private FrameCallbackFaceAnimationCallback(
         FrameListener listener,
         int frameRate,
         int frameCount) {
       super(listener, frameRate, frameCount);
-      mChoreographer = Choreographer.getInstance();
     }
 
     @Override
@@ -222,12 +221,18 @@ public void doFrame(long frameTimeNanos) {
 
     @Override
     protected void postCallback() {
-      mChoreographer.postFrameCallback(this);
+      if (sUIChoreographer == null) {
+        sUIChoreographer = Choreographer.getInstance();
+      }
+      sUIChoreographer.postFrameCallback(this);
     }
 
     @Override
     protected void cancelCallback() {
-      mChoreographer.removeFrameCallback(this);
+      if (sUIChoreographer == null) {
+        sUIChoreographer = Choreographer.getInstance();
+      }
+      sUIChoreographer.removeFrameCallback(this);
     }
   }