Merge "Ensures the slop value is fixed cross lines."

1 files changed, 2 insertions, 3 deletions

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 346bbb6fd409..c4eb39626d8b 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -6053,9 +6053,8 @@ public class Editor {
             return trueLine;
         }
 
-        final int lineHeight = layout.getLineBottom(prevLine) - layout.getLineTop(prevLine);
-        int slop = (int)(mLineSlopRatio
-                * (layout.getLineBottom(trueLine) - layout.getLineTop(trueLine)));
+        final int lineHeight = mTextView.getLineHeight();
+        int slop = (int)(mLineSlopRatio * lineHeight);
         slop = Math.max(mLineChangeSlopMin,
                 Math.min(mLineChangeSlopMax, lineHeight + slop)) - lineHeight;
         slop = Math.max(0, slop);