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

1 files changed, 2 insertions, 1 deletions

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 1210f43e6888..84ef9435f64c 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1553,7 +1553,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];