diff options
| author | Conley Owens <cco3@android.com> | 2011-04-29 14:56:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 14:56:15 -0700 |
| commit | 27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c (patch) | |
| tree | 712db76355bdc5c5e3e048fdf287b499bd3ba7b4 /core/java/android | |
| parent | 014757eea22fc9cceede1548c579c33c79464001 (diff) | |
| parent | 8b22ef66ef1a67333e2f1d4250d2c134b50ef91a (diff) | |
| download | frameworks_base-27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c.zip frameworks_base-27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c.tar.gz frameworks_base-27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c.tar.bz2 | |
am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
Using robust equality check.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/text/Layout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 1e4cca9..4107c5a 100644 --- 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 { |