diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-09-26 20:40:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-26 20:40:54 -0700 |
| commit | 3a6c2e985534aeaef04661e2875a8745022c334a (patch) | |
| tree | cf30c787d599e92ca084438d0f35046119a04a7f | |
| parent | 994897f0e7a22352b7770d6720c28d5614376227 (diff) | |
| parent | a200a23af10dfcbbe46d10e868c2eae9f2c794a4 (diff) | |
| download | frameworks_base-3a6c2e985534aeaef04661e2875a8745022c334a.zip frameworks_base-3a6c2e985534aeaef04661e2875a8745022c334a.tar.gz frameworks_base-3a6c2e985534aeaef04661e2875a8745022c334a.tar.bz2 | |
am a200a23a: Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom
* commit 'a200a23af10dfcbbe46d10e868c2eae9f2c794a4':
Bug 5332065: IOOB in case the suggestionSpan has been removed
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 317be4c..8ea55c6 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -9915,6 +9915,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { + hide(); + if (view instanceof TextView) { TextView textView = (TextView) view; Editable editable = (Editable) mText; @@ -9922,6 +9924,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener SuggestionInfo suggestionInfo = mSuggestionInfos[position]; final int spanStart = editable.getSpanStart(suggestionInfo.suggestionSpan); final int spanEnd = editable.getSpanEnd(suggestionInfo.suggestionSpan); + if (spanStart < 0 || spanEnd < 0) return; // Span has been removed final String originalText = mText.subSequence(spanStart, spanEnd).toString(); if (suggestionInfo.suggestionIndex < 0) { @@ -9983,7 +9986,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener Selection.setSelection(editable, spanEnd + lengthDifference); } } - hide(); } } |