Merge "JPtextinput: Dont break emoji characters when cutting strings." (c94a9998) · Commits · e / os / android_frameworks_base

core/java/android/text/InputFilter.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,14 @@ public interface InputFilter
	} else if (keep >= end - start) {		} else if (keep >= end - start) {
	return null; // keep original		return null; // keep original
	} else {		} 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);
	}		}
	}		}