diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-02 10:18:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 10:18:29 +0000 |
| commit | ee665151a4c6359cbfbb9a6795aa9097c4622083 (patch) | |
| tree | 42274866ba592cd70031f4e32f7e3a9399d38a35 /core/java/android/util/Spline.java | |
| parent | 152d9aae631381ea28f5701168d372a1486a7502 (diff) | |
| parent | 0c1faf43aecadc37b78c4ad6cb669eb351d21385 (diff) | |
| download | frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.zip frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.tar.gz frameworks_base-ee665151a4c6359cbfbb9a6795aa9097c4622083.tar.bz2 | |
am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
Switch from FloatMath -> Math and Math.hypot where possible
Diffstat (limited to 'core/java/android/util/Spline.java')
| -rw-r--r-- | core/java/android/util/Spline.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/util/Spline.java b/core/java/android/util/Spline.java index ed027eb..60d1e7c 100644 --- a/core/java/android/util/Spline.java +++ b/core/java/android/util/Spline.java @@ -88,7 +88,7 @@ public final class Spline { throw new IllegalArgumentException("The control points must have " + "monotonic Y values."); } - float h = FloatMath.hypot(a, b); + float h = (float) Math.hypot(a, b); if (h > 9f) { float t = 3f / h; m[i] = t * a * d[i]; |