Merge "Fix crash during cursor moving on BiDi text" into pi-dev

am: f052c26a7d

Change-Id: I18123e7e08220b1483df6fd32ec0eecd68bb38de

1 files changed, 2 insertions, 1 deletions

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 09af85db2620..c6f73cb47576 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1583,7 +1583,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];