diff options
| author | Romain Guy <romainguy@google.com> | 2011-09-06 10:58:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-06 10:58:10 -0700 |
| commit | 76e700012529eeb63011e72ef7dcba33bd1cd896 (patch) | |
| tree | f271d17ce3bc6066f59354ac89a8849b11b16ccc | |
| parent | 95d701997d349331be4a75e33d5a256cfc945e21 (diff) | |
| parent | d3462ad713a1ef101ee11b03a088343254faad97 (diff) | |
| download | frameworks_base-76e700012529eeb63011e72ef7dcba33bd1cd896.zip frameworks_base-76e700012529eeb63011e72ef7dcba33bd1cd896.tar.gz frameworks_base-76e700012529eeb63011e72ef7dcba33bd1cd896.tar.bz2 | |
am d3462ad7: Merge "Prevent crash when using <em> or <strong> in spanned strings Bug #5258853"
* commit 'd3462ad713a1ef101ee11b03a088343254faad97':
Prevent crash when using <em> or <strong> in spanned strings Bug #5258853
| -rw-r--r-- | core/java/android/text/Html.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java index 85a3bbb..ca7263c 100644 --- a/core/java/android/text/Html.java +++ b/core/java/android/text/Html.java @@ -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)); |