am 8b22ef66: am e41d2aed: Merge "Using robust equality check."

* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a': Using robust equality check.
2011-04-29 14:56:15 -07:00
parent 014757eea2 8b22ef66ef
commit 27e8f1a3a6
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1170,7 +1170,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 {