[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2

Change-Id: I6995aab201805b64e81022db295356ef8abda30c
2018-08-15 00:26:19 +00:00
parent a31be05c5b b7a2d47ec2
commit 723f13d01f
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1348,7 +1348,8 @@ public abstract class Layout {
        }

        float get(final int offset) {
-            if (mHorizontals == null) {
+            if (mHorizontals == null || offset < mLineStartOffset
+                    || offset >= mLineStartOffset + mHorizontals.length) {
                return getPrimaryHorizontal(offset);
            } else {
                return mHorizontals[offset - mLineStartOffset];