Merge change 20108 into donut
* changes: Guard against remote process dying when retrieving column from cursor.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user