commit 059ba9814bb07aeebd8bf697fc05ff833c63033b
author John Reck <jreck@google.com> Mon Mar 16 15:09:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 16 15:09:04 2015 +0000
tree 0884222a4ff1124584947f47535332db6015c630
parent c64f5ca02b16ebece40c21f401f75c7ace8178ac
parent 386dcbddf5c166f98209b78389e79d49ab3a8222

am 386dcbdd: Merge "Frameworks/base: Fix missing cast"

* commit '386dcbddf5c166f98209b78389e79d49ab3a8222':
  Frameworks/base: Fix missing cast

core/java/com/android/internal/view/animation/FallbackLUTInterpolator.java

diff --git a/core/java/com/android/internal/view/animation/FallbackLUTInterpolator.java b/core/java/com/android/internal/view/animation/FallbackLUTInterpolator.java
index 06838c9..526e2ae 100644
--- a/core/java/com/android/internal/view/animation/FallbackLUTInterpolator.java
+++ b/core/java/com/android/internal/view/animation/FallbackLUTInterpolator.java
@@ -45,7 +45,7 @@
     private static float[] createLUT(TimeInterpolator interpolator, long duration) {
         long frameIntervalNanos = Choreographer.getInstance().getFrameIntervalNanos();
         int animIntervalMs = (int) (frameIntervalNanos / TimeUtils.NANOS_PER_MS);
-        int numAnimFrames = (int) Math.ceil(duration / animIntervalMs);
+        int numAnimFrames = (int) Math.ceil(((double) duration) / animIntervalMs);
         float values[] = new float[numAnimFrames];
         float lastFrame = numAnimFrames - 1;
         for (int i = 0; i < numAnimFrames; i++) {