diff options
| author | Marco Nelissen <marcone@google.com> | 2014-01-15 09:22:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 09:22:55 -0800 |
| commit | cb15fb6041e604025d4b76645435f8cbafee754c (patch) | |
| tree | b26a53f053b2d314aa563f315f89ea0b9d4bd8fe | |
| parent | 65e3350cd241bb2e087459291051131bfe4c09ad (diff) | |
| parent | 0d4916f19f81f80fc83eb7646c6d339630d5f618 (diff) | |
am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
Before requerying a cursor, check if it is closed.
| -rwxr-xr-x[-rw-r--r--] | core/java/android/widget/CursorTreeAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/CursorTreeAdapter.java b/core/java/android/widget/CursorTreeAdapter.java index 44d16564e5ce..405e45ac3f5f 100644..100755 --- a/core/java/android/widget/CursorTreeAdapter.java +++ b/core/java/android/widget/CursorTreeAdapter.java @@ -497,7 +497,7 @@ public abstract class CursorTreeAdapter extends BaseExpandableListAdapter implem @Override public void onChange(boolean selfChange) { - if (mAutoRequery && mCursor != null) { + if (mAutoRequery && mCursor != null && !mCursor.isClosed()) { if (false) Log.v("Cursor", "Auto requerying " + mCursor + " due to update"); mDataValid = mCursor.requery(); |