am e41d2aed: Merge "Using robust equality check."

* commit 'e41d2aed9c8d990d31af70642ae688dad1d8fb4b': Using robust equality check.
2011-04-28 23:52:32 -07:00
parent a951701226 e41d2aed9c
commit 8b22ef66ef
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1154,7 +1154,7 @@ public abstract class Layout {
        if (h2 < 0.5f)
            h2 = 0.5f;

-        if (h1 == h2) {
+        if (Float.compare(h1, h2) == 0) {
            dest.moveTo(h1, top);
            dest.lineTo(h1, bottom);
        } else {