From 912ab78c5fa65dcdebaf5d4b26ff4964b6785907 Mon Sep 17 00:00:00 2001 From: "jangwon.lee" Date: Mon, 11 Nov 2013 15:55:46 +0900 Subject: [PATCH] Before requerying a cursor, check if it is closed. Before updating a cursor, it needs to be checked if it is valid. Currently a defence code only checks if it is not null. But in case of "Cursor", it is not valid, if it is closed. So just like in CursorAdapter.onContentChanged(), add the additional defence code to check validation. Change-Id: I1302f1b6d009897815d4bdb2f20f625688cf9901 --- core/java/android/widget/CursorTreeAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 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 44d16564e5ce..405e45ac3f5f --- 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();