commit c94a99987d8a49ea599c22ffad0e61db591963e0
author Kenny Root <kroot@android.com> Fri Feb 04 15:42:14 2011 -0800
committer Android Code Review <code-review@android.com> Fri Feb 04 15:42:14 2011 -0800
tree 0480633ff3532624c2741e1aef6d5fcf5562e356
parent b083d3b816378ef3b9dceb33b2c2e20510b2632b
parent 2f0f44212fc1e86bd7bd54431bf6a0cd62aa093c

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

core/java/android/text/InputFilter.java

diff --git a/core/java/android/text/InputFilter.java b/core/java/android/text/InputFilter.java
index 2f55677..8d4b08e 100644
--- a/core/java/android/text/InputFilter.java
+++ b/core/java/android/text/InputFilter.java
@@ -88,7 +88,14 @@
             } 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);
             }
         }