diff options
| author | Bjorn Bringert <> | 2009-04-24 02:59:00 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-24 02:59:00 -0700 |
| commit | 7fc4b281750be2442a327e7aa9fb03c44096caf3 (patch) | |
| tree | 054cd392bb823629481b56277234e51f12bb33e0 | |
| parent | 96a98d61d7a8360e7a70c91281a9d608837a6056 (diff) | |
| parent | 4369397d0697810241f7a7ab22891930067166dd (diff) | |
| download | frameworks_base-7fc4b281750be2442a327e7aa9fb03c44096caf3.zip frameworks_base-7fc4b281750be2442a327e7aa9fb03c44096caf3.tar.gz frameworks_base-7fc4b281750be2442a327e7aa9fb03c44096caf3.tar.bz2 | |
Merge branch 'readonly-p4-donut' into donut
| -rw-r--r-- | core/java/android/app/SuggestionsAdapter.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java index 0513fe1..af2a321 100644 --- a/core/java/android/app/SuggestionsAdapter.java +++ b/core/java/android/app/SuggestionsAdapter.java @@ -150,9 +150,12 @@ class SuggestionsAdapter extends ResourceCursorAdapter { @Override public void bindView(View view, Context context, Cursor cursor) { - ChildViewCache views = (ChildViewCache) view.getTag(); - String format = cursor.getString(mFormatCol); - boolean isHtml = "html".equals(format); + ChildViewCache views = (ChildViewCache) view.getTag(); + boolean isHtml = false; + if (mFormatCol >= 0) { + String format = cursor.getString(mFormatCol); + isHtml = "html".equals(format); + } setViewText(cursor, views.mText1, mText1Col, isHtml); setViewText(cursor, views.mText2, mText2Col, isHtml); setViewIcon(cursor, views.mIcon1, mIconBitmap1Col, mIconName1Col); |