am 8e3c3f64: Merge change 7514 into donut

Merge commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514'

* commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514':
  Only parse search suggestions that look like HTML

1 files changed, 10 insertions, 1 deletions

diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java
index a30d911d252e..dc5e864af87a 100644
--- a/core/java/android/app/SuggestionsAdapter.java
+++ b/core/java/android/app/SuggestionsAdapter.java
@@ -351,7 +351,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
         CharSequence text = null;
         if (textCol >= 0) {
             String str = cursor.getString(textCol);
-            if (isHtml && !TextUtils.isEmpty(str)) {
+            if (isHtml && looksLikeHtml(str)) {
                 text = Html.fromHtml(str);
             } else {
                 text = str;
@@ -367,6 +367,15 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
         }
     }
 
+    private static boolean looksLikeHtml(String str) {
+        if (TextUtils.isEmpty(str)) return false;
+        for (int i = str.length() - 1; i >= 0; i--) {
+            char c = str.charAt(i);
+            if (c == '<' || c == '&') return true;
+        }
+        return false;
+    }
+
     private Drawable getIcon1(Cursor cursor) {
         if (mIconName1Col < 0) {
             return null;