commit 0d4916f19f81f80fc83eb7646c6d339630d5f618
author Marco Nelissen <marcone@google.com> Wed Jan 15 09:19:52 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 15 09:19:52 2014 -0800
tree c2d054b910d582d52e9b5e446d92480229b4dc32
parent a9045d24a73faa6aa1e8ad204a1e14a53711a824
parent c3036a12467395465b86e6935af8aa500c1b128d

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

* commit 'c3036a12467395465b86e6935af8aa500c1b128d':
  Before requerying a cursor, check if it is closed.

core/java/android/widget/CursorTreeAdapter.java

diff --git a/core/java/android/widget/CursorTreeAdapter.java b/core/java/android/widget/CursorTreeAdapter.java
old mode 100644
new mode 100755
index 44d1656..405e45a
--- a/core/java/android/widget/CursorTreeAdapter.java
+++ b/core/java/android/widget/CursorTreeAdapter.java
@@ -497,7 +497,7 @@
 
             @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();