Commit 6465889e authored Feb 04, 2011 by Kenny Root Committed by Android Git Automerger Feb 04, 2011

am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji...

am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."

* commit 'c4dfa998':
  JPtextinput: Dont break emoji characters when cutting strings.

parents d1f0947a c4dfa998

core/java/android/text/InputFilter.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,14 @@ public interface InputFilter
		} else if (keep >= end - start) {
		return null; // keep original
		} else {
		return source.subSequence(start, start + keep);
		keep += start;
		if (Character.isHighSurrogate(source.charAt(keep - 1))) {
		--keep;
		if (keep == start) {
		return "";
		}
		}
		return source.subSequence(start, keep);
		}
		}