Merge "JPtextinput: Dont break emoji characters when cutting strings."

2011-02-04 15:42:14 -08:00
parent b083d3b816 2f0f44212f
commit c94a99987d
1 changed files with 8 additions and 1 deletions
--- a/core/java/android/text/InputFilter.java
+++ b/core/java/android/text/InputFilter.java
@@ -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);
            }
        }