[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb

Change-Id: I221d974ba9402c088235d5bdb3c94e91cf4167ba
2018-08-15 19:12:52 +00:00
parent fce27e8502 82c84d5fbb
commit 12baaa2bc3
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1390,7 +1390,8 @@ public abstract class Layout {
        }

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