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

Commit 8e3c3f64 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 7514 into donut 

* changes:
  Only parse search suggestions that look like HTML
parents 5380aa29 84ee7433

core/java/android/app/SuggestionsAdapter.java

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