summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2015-05-05 17:43:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-05 17:43:30 +0000
commitbe8db119726a229ca687b99fcdb8a6a959648cd1 (patch)
treecdbea74872487077db990a9a31e9745d5f8c0f0b /core/java/android
parent9e540a512281560a9b4ffc0edbe68cddaf9bc3b4 (diff)
parent8e71a397c6542d6a37cd59ea8b53236ac2dba86a (diff)
downloadframeworks_base-be8db119726a229ca687b99fcdb8a6a959648cd1.zip
frameworks_base-be8db119726a229ca687b99fcdb8a6a959648cd1.tar.gz
frameworks_base-be8db119726a229ca687b99fcdb8a6a959648cd1.tar.bz2
Merge "Fix NPE in Html.inParagraph()" into mnc-dev
Diffstat (limited to 'core/java/android')
-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 7bebbfb..a55a08c 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>");
}
}