diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-05 10:43:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-05 10:43:47 -0700 |
| commit | 9d1a3149f35b716caeda89dad53c0d8c45c6ca4b (patch) | |
| tree | b5e944a396bd807d0322e7546a08ace514f8f5e9 /core | |
| parent | cbd7fa57eeb5b3bfe9d78cd7d8bf82c1629041e8 (diff) | |
| parent | d4543c519b7724841eb77bb57ff360e6c40cd69a (diff) | |
| download | frameworks_base-9d1a3149f35b716caeda89dad53c0d8c45c6ca4b.zip frameworks_base-9d1a3149f35b716caeda89dad53c0d8c45c6ca4b.tar.gz frameworks_base-9d1a3149f35b716caeda89dad53c0d8c45c6ca4b.tar.bz2 | |
am d4543c51: Merge change 20108 into donut
Merge commit 'd4543c519b7724841eb77bb57ff360e6c40cd69a'
* commit 'd4543c519b7724841eb77bb57ff360e6c40cd69a':
Guard against remote process dying when retrieving column from cursor.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/SuggestionsAdapter.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java index 4a00e48..bd4e66e 100644 --- a/core/java/android/app/SuggestionsAdapter.java +++ b/core/java/android/app/SuggestionsAdapter.java @@ -658,7 +658,14 @@ class SuggestionsAdapter extends ResourceCursorAdapter { if (col == NONE) { return null; } - return cursor.getString(col); + try { + return cursor.getString(col); + } catch (Exception e) { + Log.e(LOG_TAG, + "unexpected error retrieving valid column from cursor, " + + "did the remote process die?", e); + return null; + } } } |