diff options
| author | Yoshiki Iguchi <yoshiki@google.com> | 2015-10-22 07:39:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 07:39:17 +0000 |
| commit | 6649ee972b2bfbeca2d664cfd6629810ebbc7ac8 (patch) | |
| tree | 3b1dbe1f6da37dbfc2cee332f246740c4d34e31e /core/java/android/widget | |
| parent | bdc458048abee78a945a26cd13a71245e7d4a2e5 (diff) | |
| parent | 9582e151964be60457d4abd712857fb1e8a4586d (diff) | |
| download | frameworks_base-6649ee972b2bfbeca2d664cfd6629810ebbc7ac8.zip frameworks_base-6649ee972b2bfbeca2d664cfd6629810ebbc7ac8.tar.gz frameworks_base-6649ee972b2bfbeca2d664cfd6629810ebbc7ac8.tar.bz2 | |
Fix crash on calling removeSelection with showing selection handlers
am: 9582e15196
* commit '9582e151964be60457d4abd712857fb1e8a4586d':
Fix crash on calling removeSelection with showing selection handlers
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/Editor.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index b0dcbb8..13c1937 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -4253,10 +4253,14 @@ public class Editor { positionAtCursorOffset(offset, false); } + /** + * @param offset Cursor offset. Must be in [-1, length]. + * @param parentScrolled If the parent has been scrolled or not. + */ @Override protected void positionAtCursorOffset(int offset, boolean parentScrolled) { super.positionAtCursorOffset(offset, parentScrolled); - mInWord = !getWordIteratorWithText().isBoundary(offset); + mInWord = (offset != -1) && !getWordIteratorWithText().isBoundary(offset); } @Override @@ -4489,10 +4493,14 @@ public class Editor { positionAtCursorOffset(offset, false); } + /** + * @param offset Cursor offset. Must be in [-1, length]. + * @param parentScrolled If the parent has been scrolled or not. + */ @Override protected void positionAtCursorOffset(int offset, boolean parentScrolled) { super.positionAtCursorOffset(offset, parentScrolled); - mInWord = !getWordIteratorWithText().isBoundary(offset); + mInWord = (offset != -1) && !getWordIteratorWithText().isBoundary(offset); } @Override |