commit bf441335ea5b02d15c1c9524508c7bb8acc0ed8a
author Mihai Popa <popam@google.com> Wed Aug 15 19:23:35 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 15 19:23:35 2018 +0000
tree 8a38135398b417b5c7a6c4f103874687461e770e
parent 25f2fa4cf7f1b882c921c12ac126f815eaa3da91
parent 65082f8f5b0a85164f283a96ded58745431ea0e5

Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into nyc-dev

* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
  Fix crash during cursor moving on BiDi text

core/java/android/text/Layout.java

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index c94e489..3bc9390 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1390,7 +1390,8 @@
         }
 
         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];