diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-08-15 19:13:15 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-08-15 19:13:15 +0000 |
| commit | dfec065bd504bdf9673ca2678b6183aa89017672 (patch) | |
| tree | ad4fcf5e5df14a581594da13334cc3cbad71783e /core/java/android | |
| parent | 9d85c1ff53a80c03cc05e644dd28a232ba052258 (diff) | |
| parent | 8f85f5ffd235325ac7a8a03b2adb9eba12c96351 (diff) | |
[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4 am: a959ee227a am: 8f85f5ffd2
Change-Id: If854f61c2516a61ac36426c10eafd30bf638e919
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/text/Layout.java | 3 |
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]; |