Merge "Validate index for cursor on BiDi text"

1 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 98d6e955dde2..ca952da15c72 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1601,10 +1601,11 @@ public abstract class Layout {
         }
 
         float get(final int offset) {
-            if (mHorizontals == null || offset < 0 || offset >= mHorizontals.length) {
+            final int index = offset - mLineStartOffset;
+            if (mHorizontals == null || index < 0 || index >= mHorizontals.length) {
                 return getHorizontal(offset, mPrimary);
             } else {
-                return mHorizontals[offset - mLineStartOffset];
+                return mHorizontals[index];
             }
         }
     }