Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on calling removeSelection with showing selection handlers am: 9582e15196

Browse Source 
am: 6649ee972b

* commit '6649ee972b2bfbeca2d664cfd6629810ebbc7ac8':
  Fix crash on calling removeSelection with showing selection handlers
This commit is contained in:
Yoshiki Iguchi
2015-10-22 07:44:15 +00:00
committed by android-build-merger
parent bb8f652372 6649ee972b
commit 6a5bb1534c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/Editor.java
View File

@@ -4253,10 +4253,14 @@ public class Editor {
positionAtCursorOffset(offset, false); positionAtCursorOffset(offset, false);
} }
/**
* @param offset Cursor offset. Must be in [-1, length].
* @param parentScrolled If the parent has been scrolled or not.
*/
@Override @Override
protected void positionAtCursorOffset(int offset, boolean parentScrolled) { protected void positionAtCursorOffset(int offset, boolean parentScrolled) {
super.positionAtCursorOffset(offset, parentScrolled); super.positionAtCursorOffset(offset, parentScrolled);
mInWord = !getWordIteratorWithText().isBoundary(offset); mInWord = (offset != -1) && !getWordIteratorWithText().isBoundary(offset);
} }
@Override @Override
@@ -4489,10 +4493,14 @@ public class Editor {
positionAtCursorOffset(offset, false); positionAtCursorOffset(offset, false);
} }
/**
* @param offset Cursor offset. Must be in [-1, length].
* @param parentScrolled If the parent has been scrolled or not.
*/
@Override @Override
protected void positionAtCursorOffset(int offset, boolean parentScrolled) { protected void positionAtCursorOffset(int offset, boolean parentScrolled) {
super.positionAtCursorOffset(offset, parentScrolled); super.positionAtCursorOffset(offset, parentScrolled);
mInWord = !getWordIteratorWithText().isBoundary(offset); mInWord = (offset != -1) && !getWordIteratorWithText().isBoundary(offset);
} }
@Override @Override