diff options
| author | Conley Owens <cco3@android.com> | 2011-04-28 23:52:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-28 23:52:32 -0700 |
| commit | 8b22ef66ef1a67333e2f1d4250d2c134b50ef91a (patch) | |
| tree | 231d058dd91a4bc3927fc8cb11c3e07b10bbd013 /core/java/android | |
| parent | a95170122619f5442d5efbdf2e37f91dbf455ab9 (diff) | |
| parent | e41d2aed9c8d990d31af70642ae688dad1d8fb4b (diff) | |
| download | frameworks_base-8b22ef66ef1a67333e2f1d4250d2c134b50ef91a.zip frameworks_base-8b22ef66ef1a67333e2f1d4250d2c134b50ef91a.tar.gz frameworks_base-8b22ef66ef1a67333e2f1d4250d2c134b50ef91a.tar.bz2 | |
am e41d2aed: Merge "Using robust equality check."
* commit 'e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
Using robust equality check.
Diffstat (limited to 'core/java/android')
| -rwxr-xr-x | 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 4e197cd..b62aa40 100755 --- 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 { |