[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 am: 8f85f5ff

Change-Id: If854f61c2516a61ac36426c10eafd30bf638e919

parents 9d85c1ff 8f85f5ff

core/java/android/text/Layout.java

+2 −1

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