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

am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread

Browse Source 
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp

* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
  Fix for an NPE in TextView.
This commit is contained in:
Gilles Debunne
2010-08-24 14:25:57 -07:00
committed by Android Git Automerger
parent 6cf1a8bfb0 e2978c8dca
commit b32d0f23a8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6474,10 +6474,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (!mFrozenWithFocus || (selStart < 0 || selEnd < 0)) {
boolean selMoved = mSelectionMoved;
final int touchOffset =
((SelectionModifierCursorController) mSelectionModifierCursorController).
getMinTouchOffset();
Selection.setSelection((Spannable) mText, touchOffset);
if (mSelectionModifierCursorController != null) {
final int touchOffset =
((SelectionModifierCursorController) mSelectionModifierCursorController).
getMinTouchOffset();
Selection.setSelection((Spannable) mText, touchOffset);
}
if (mMovement != null) {
mMovement.onTakeFocus(this, (Spannable) mText, direction);