Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3462ad7 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

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

parents e4dbe88b dd808c0b

core/java/android/text/Html.java

+2 −2
Original line number Diff line number Diff line
@@ -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));