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

Change-Id: Id97c3f508a0dcd82978b06891b3a979921d4be3a
2018-08-15 00:26:10 +00:00
parent 70e4dec56b 95218ce7ea
commit b7a2d47ec2
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];