Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ee4c84642afffa80f23039bbc2d4f59de11f67da':
  Handle surrogate pairs in Html.toHtml()
This commit is contained in:
Victoria Lease
2013-11-01 13:27:46 -07:00
committed by Android Git Automerger
parent 6be8dde6f6 ee4c84642a
commit 24a24b2790
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/text/Html.java
View File

@@ -391,6 +391,15 @@ public class Html {
out.append(">"); out.append(">");
} else if (c == '&') { } else if (c == '&') {
out.append("&"); 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 < ' ') { } else if (c > 0x7E || c < ' ') {
out.append("&#").append((int) c).append(";"); out.append("&#").append((int) c).append(";");
} else if (c == ' ') { } else if (c == ' ') {