am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev

* commit '24a24b27903785dedb507b11583b70975fe9f8e4':
  Handle surrogate pairs in Html.toHtml()

1 files changed, 9 insertions, 0 deletions

diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java
index 160c630bf527..f839d52b0126 100644
--- a/core/java/android/text/Html.java
+++ b/core/java/android/text/Html.java
@@ -391,6 +391,15 @@ public class Html {
                 out.append(">");
             } else if (c == '&') {
                 out.append("&");
+            } else if (c >= 0xD800 && c <= 0xDFFF) {
+                if (c < 0xDC00 && i + 1 < end) {
+                    char d = text.charAt(i + 1);
+                    if (d >= 0xDC00 && d <= 0xDFFF) {
+                        i++;
+                        int codepoint = 0x010000 | (int) c - 0xD800 << 10 | (int) d - 0xDC00;
+                        out.append("&#").append(codepoint).append(";");
+                    }
+                }
             } else if (c > 0x7E || c < ' ') {
                 out.append("&#").append((int) c).append(";");
             } else if (c == ' ') {