diff options
| author | Conley Owens <cco3@android.com> | 2011-04-29 15:11:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 15:11:34 -0700 |
| commit | a02a9e602bf1b5337cde30ee16ca6c4a36d9f07b (patch) | |
| tree | a7a35a123a66ffa2421f1e5d015a05bd12afa237 /core/java/android/text | |
| parent | 1b38cc30573589b5cdf7bf5c1d848333477269e3 (diff) | |
| parent | 27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c (diff) | |
| download | frameworks_base-a02a9e602bf1b5337cde30ee16ca6c4a36d9f07b.zip frameworks_base-a02a9e602bf1b5337cde30ee16ca6c4a36d9f07b.tar.gz frameworks_base-a02a9e602bf1b5337cde30ee16ca6c4a36d9f07b.tar.bz2 | |
am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
* commit '27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
Using robust equality check.
Diffstat (limited to 'core/java/android/text')
| -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 { |