Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7514 into donut

Browse Source 
* changes:
  Only parse search suggestions that look like HTML
This commit is contained in:
Android (Google) Code Review
2009-07-16 06:32:52 -07:00
parent 5380aa2947 84ee74335f
commit 8e3c3f6461
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/app/SuggestionsAdapter.java
View File

@@ -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;