am 37e169cd: Add a safety net to set range span in the spell checker (0b8d272e) · Commits · e / os / android_frameworks_base

core/java/android/widget/SpellChecker.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -473,8 +473,16 @@ public class SpellChecker implements SpellCheckerSessionListener {
		private Object mRange = new Object();

		public void parse(int start, int end) {
		if (end > start) {
		setRangeSpan((Editable) mTextView.getText(), start, end);
		final int max = mTextView.length();
		final int parseEnd;
		if (end > max) {
		Log.w(TAG, "Parse invalid region, from " + start + " to " + end);
		parseEnd = max;
		} else {
		parseEnd = end;
		}
		if (parseEnd > start) {
		setRangeSpan((Editable) mTextView.getText(), start, parseEnd);
		parse();
		}
		}
		@@ -612,6 +620,8 @@ public class SpellChecker implements SpellCheckerSessionListener {
		break;
		}
		if (spellCheckEnd <= spellCheckStart) {
		Log.w(TAG, "Trying to spellcheck invalid region, from "
		+ start + " to " + end);
		break;
		}
		if (createSpellCheckSpan) {