summaryrefslogtreecommitdiff
path: root/core/java/android/text/Html.java
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2015-05-05 10:13:54 -0700
committerRaph Levien <raph@google.com>2015-05-05 10:13:54 -0700
commit8e71a397c6542d6a37cd59ea8b53236ac2dba86a (patch)
tree27c1f7d501c64723083c1fc861bee0164e396e1d /core/java/android/text/Html.java
parent5551aca2b8ec9fe7ab5ffda8dad82ee104556962 (diff)
Fix NPE in Html.inParagraph()
The typeface in a TypefaceSpan can be the null string. This patch fixes the string comparison to not throw a NullPointerException. Bug: 20849738 Change-Id: Ied049305794966bcbca00cfd11fe97a91b685d79
Diffstat (limited to 'core/java/android/text/Html.java')
-rw-r--r--core/java/android/text/Html.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java
index 7bebbfb060db..a55a08cc73e2 100644
--- a/core/java/android/text/Html.java
+++ b/core/java/android/text/Html.java
@@ -278,7 +278,7 @@ public class Html {
if (style[j] instanceof TypefaceSpan) {
String s = ((TypefaceSpan) style[j]).getFamily();
- if (s.equals("monospace")) {
+ if ("monospace".equals(s)) {
out.append("<tt>");
}
}