diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java index 84551c418d4..9f29c619503 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java @@ -9,6 +9,7 @@ package com.facebook.react.animated; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.bridge.ReadableType; /** * Implementation of {@link AnimationDriver} which provides a support for simple time-based @@ -41,8 +42,17 @@ class FrameBasedAnimationDriver extends AnimationDriver { for (int i = 0; i < numberOfFrames; i++) { mFrames[i] = frames.getDouble(i); } - mToValue = config.hasKey("toValue") ? config.getDouble("toValue") : 0; - mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1; + if(config.hasKey("toValue")) { + mToValue = config.getType("toValue") == ReadableType.Number ? config.getDouble("toValue") : 0; + } else { + mToValue = 0; + } + if(config.hasKey("iterations")) { + mIterations = config.getType("iterations") == ReadableType.Number ? + config.getInt("iterations") : 1; + } else { + mIterations = 1; + } mCurrentLoop = 1; mHasFinished = mIterations == 0; mStartFrameTimeNanos = -1;