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

am d3462ad7: Merge "Prevent crash when using <em> or <strong> in spanned strings Bug #5258853"

Browse Source 
* commit 'd3462ad713a1ef101ee11b03a088343254faad97':
  Prevent crash when using <em> or <strong> in spanned strings Bug #5258853
This commit is contained in:
Romain Guy
2011-09-06 10:58:10 -07:00
committed by Android Git Automerger
parent 95d701997d d3462ad713
commit 76e7000125
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -499,11 +499,11 @@ class HtmlToSpannedConverter implements ContentHandler {
handleP(mSpannableStringBuilder);
} else if (tag.equalsIgnoreCase("div")) {
handleP(mSpannableStringBuilder);
} else if (tag.equalsIgnoreCase("em")) {
} else if (tag.equalsIgnoreCase("strong")) {
end(mSpannableStringBuilder, Bold.class, new StyleSpan(Typeface.BOLD));
} else if (tag.equalsIgnoreCase("b")) {
end(mSpannableStringBuilder, Bold.class, new StyleSpan(Typeface.BOLD));
} else if (tag.equalsIgnoreCase("strong")) {
} else if (tag.equalsIgnoreCase("em")) {
end(mSpannableStringBuilder, Italic.class, new StyleSpan(Typeface.ITALIC));
} else if (tag.equalsIgnoreCase("cite")) {
end(mSpannableStringBuilder, Italic.class, new StyleSpan(Typeface.ITALIC));