Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom

Author: Fabrice Di Meglio

core/java/android/widget/TextView.java

@@ -9879,13 +9879,16 @@ private void highlightTextDifferences(SuggestionInfo suggestionInfo, int unionSt
 
         @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;
 
                 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) {
@@ -9947,7 +9950,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                     Selection.setSelection(editable, spanEnd + lengthDifference);
                 }
             }
-            hide();
         }
     }