diff options
| author | Adam Powell <adamp@google.com> | 2010-11-08 19:56:44 -0800 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-11-08 19:56:44 -0800 |
| commit | dd11387e580343cf053df03a955e042f4ee445d7 (patch) | |
| tree | 02dcab0d39d03ea3b15b127dc3b671fc40c2e82c /core/java/android | |
| parent | 3c09ba3f798c8dafed4846c6782bc489b841cdbb (diff) | |
Fix typo in manual merge
Change-Id: Idaf98e368e032cfbd7fbe3aa2d965b04eea3f43e
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 4ede4ee3b088..bdc5014eeb92 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -6847,7 +6847,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return superResult; } - if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() + if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() && mText instanceof Spannable && mLayout != null) { if (hasInsertionController()) { getInsertionController().onTouchEvent(event); |