commit 79cb5505a97a0465fb849dc20dcaf3dd2f608c9f
author Raph Levien <raph@google.com> Thu Apr 24 16:25:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 24 16:25:21 2014 +0000
tree 1171946b1942dfd620c165ab1ef2d19274cd5bf5
parent 83474f5b4d870c12d39cef5ae28b7e3fb6d6a765
parent 07bed4921a05e717a4b7f10a25e3830e346426b7

am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev

* commit '07bed4921a05e717a4b7f10a25e3830e346426b7':
  Fix bug 14276128 Clipping at bottom of TextView

core/java/android/text/StaticLayout.java

diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index 638ef22..f7ac75a 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -653,7 +653,7 @@
 
         int extra;
 
-        if (needMultiply) {
+        if (needMultiply && end != bufEnd) {
             double ex = (below - above) * (spacingmult - 1) + spacingadd;
             if (ex >= 0) {
                 extra = (int)(ex + EXTRA_ROUNDING);