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

[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5f am: 12baaa2b am: 99e3f649 am: a959ee22

Change-Id: I7cb6623befc84f76e783b8800aa18ce28a8cc2b7

parents cdc0a14f a959ee22

core/java/android/text/Layout.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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];