Merge "Fix a CTS test" into lmp-preview-dev (1f3bb847) · Commits · e / os / android_frameworks_base

core/java/android/text/SpannableStringBuilder.java

+1 −17

Original line number	Diff line number	Diff line
		@@ -440,26 +440,10 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable
		}

		// Documentation from interface
		public SpannableStringBuilder replace(int start, int end,
		public SpannableStringBuilder replace(final int start, final int end,
		CharSequence tb, int tbstart, int tbend) {
		checkRange("replace", start, end);

		// Sanity check
		if (start > end) {
		Log.w(TAG, "Bad arguments to #replace : "
		+ "start = " + start + ", end = " + end);
		final int tmp = start;
		start = end;
		end = tmp;
		}
		if (tbstart > tbend) {
		Log.w(TAG, "Bad arguments to #replace : "
		+ "tbstart = " + tbstart + ", tbend = " + tbend);
		final int tmp = tbstart;
		tbstart = tbend;
		tbend = tmp;
		}

		int filtercount = mFilters.length;
		for (int i = 0; i < filtercount; i++) {
		CharSequence repl = mFilters[i].filter(tb, tbstart, tbend, this, start, end);

+0 −1

Original line number	Diff line number	Diff line
		@@ -5842,7 +5842,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		int end = text.partialEndOffset;
		if (end > N) end = N;
		removeParcelableSpans(content, start, end);
		// If start > end, content.replace will swap them before using them.
		content.replace(start, end, text.text);
		}
		}