am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."

* commit 'cb15fb6041e604025d4b76645435f8cbafee754c':
  Before requerying a cursor, check if it is closed.
This commit is contained in:
Marco Nelissen
2014-01-15 17:27:19 +00:00
committed by Android Git Automerger

2
core/java/android/widget/CursorTreeAdapter.java Normal file → Executable file
View File

@ -497,7 +497,7 @@ public abstract class CursorTreeAdapter extends BaseExpandableListAdapter implem
@Override @Override
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
if (mAutoRequery && mCursor != null) { if (mAutoRequery && mCursor != null && !mCursor.isClosed()) {
if (false) Log.v("Cursor", "Auto requerying " + mCursor + if (false) Log.v("Cursor", "Auto requerying " + mCursor +
" due to update"); " due to update");
mDataValid = mCursor.requery(); mDataValid = mCursor.requery();