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

am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread

Browse Source 
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.
This commit is contained in:
Gilles Debunne
2010-08-26 11:01:34 -07:00
committed by Android Git Automerger
parent fe8eaf3b5d 1b400c7763
commit f309c7a869
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/TextView.java
View File

@@ -7122,6 +7122,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
int selectionStart, selectionEnd;
// selectionModifierCursorController is not null at that point
SelectionModifierCursorController selectionModifierCursorController =
((SelectionModifierCursorController) mSelectionModifierCursorController);
int minOffset = selectionModifierCursorController.getMinTouchOffset();
@@ -7145,6 +7146,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
private String getWordForDictionary() {
if (mSelectionModifierCursorController == null) {
return null;
}
int offset = ((SelectionModifierCursorController) mSelectionModifierCursorController).
getMinTouchOffset();