Merge "Don't close the database until all references released." (bba4179d) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −7

core/java/android/database/Cursor.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@ import android.content.ContentResolver;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Bundle;		import android.os.Bundle;

			import java.io.Closeable;

	/**		/**
	* This interface provides random read-write access to the result set returned		* This interface provides random read-write access to the result set returned
	* by a database query.		* by a database query.
	@@ -27,7 +29,7 @@ import android.os.Bundle;
	* Cursor implementations are not required to be synchronized so code using a Cursor from multiple		* Cursor implementations are not required to be synchronized so code using a Cursor from multiple
	* threads should perform its own synchronization when using the Cursor.		* threads should perform its own synchronization when using the Cursor.
	*/		*/
	public interface Cursor {		public interface Cursor extends Closeable {
	/*		/*
	* Values returned by {@link #getType(int)}.		* Values returned by {@link #getType(int)}.
	* These should be consistent with the corresponding types defined in CursorWindow.h		* These should be consistent with the corresponding types defined in CursorWindow.h

core/java/android/database/CursorWindow.java

+7 −10

Original line number	Original line	Diff line number	Diff line
	@@ -168,14 +168,6 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
	return mName;		return mName;
	}		}

	/**
	* Closes the cursor window and frees its underlying resources when all other
	* remaining references have been released.
	*/
	public void close() {
	releaseReference();
	}

	/**		/**
	* Clears out the existing contents of the window, making it safe to reuse		* Clears out the existing contents of the window, making it safe to reuse
	* for new data.		* for new data.
	@@ -703,8 +695,13 @@ public class CursorWindow extends SQLiteClosable implements Parcelable {
	}		}

	public void writeToParcel(Parcel dest, int flags) {		public void writeToParcel(Parcel dest, int flags) {
			acquireReference();
			try {
	dest.writeInt(mStartPos);		dest.writeInt(mStartPos);
	nativeWriteToParcel(mWindowPtr, dest);		nativeWriteToParcel(mWindowPtr, dest);
			} finally {
			releaseReference();
			}

	if ((flags & Parcelable.PARCELABLE_WRITE_RETURN_VALUE) != 0) {		if ((flags & Parcelable.PARCELABLE_WRITE_RETURN_VALUE) != 0) {
	releaseReference();		releaseReference();

core/java/android/database/DatabaseUtils.java

+45 −52

Original line number	Original line	Diff line number	Diff line
	@@ -269,8 +269,6 @@ public class DatabaseUtils {
	if (position < 0 \|\| position >= cursor.getCount()) {		if (position < 0 \|\| position >= cursor.getCount()) {
	return;		return;
	}		}
	window.acquireReference();
	try {
	final int oldPos = cursor.getPosition();		final int oldPos = cursor.getPosition();
	final int numColumns = cursor.getColumnCount();		final int numColumns = cursor.getColumnCount();
	window.clear();		window.clear();
	@@ -321,11 +319,6 @@ public class DatabaseUtils {
	} while (cursor.moveToNext());		} while (cursor.moveToNext());
	}		}
	cursor.moveToPosition(oldPos);		cursor.moveToPosition(oldPos);
	} catch (IllegalStateException e){
	// simply ignore it
	} finally {
	window.releaseReference();
	}
	}		}

	/**		/**

core/java/android/database/sqlite/SQLiteClosable.java

+53 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,15 +16,39 @@

	package android.database.sqlite;		package android.database.sqlite;

			import java.io.Closeable;

	/**		/**
	* An object created from a SQLiteDatabase that can be closed.		* An object created from a SQLiteDatabase that can be closed.
			*
			* This class implements a primitive reference counting scheme for database objects.
	*/		*/
	public abstract class SQLiteClosable {		public abstract class SQLiteClosable implements Closeable {
	private int mReferenceCount = 1;		private int mReferenceCount = 1;

			/**
			* Called when the last reference to the object was released by
			* a call to {@link #releaseReference()} or {@link #close()}.
			*/
	protected abstract void onAllReferencesReleased();		protected abstract void onAllReferencesReleased();
	protected void onAllReferencesReleasedFromContainer() {}

			/**
			* Called when the last reference to the object was released by
			* a call to {@link #releaseReferenceFromContainer()}.
			*
			* @deprecated Do not use.
			*/
			@Deprecated
			protected void onAllReferencesReleasedFromContainer() {
			onAllReferencesReleased();
			}

			/**
			* Acquires a reference to the object.
			*
			* @throws IllegalStateException if the last reference to the object has already
			* been released.
			*/
	public void acquireReference() {		public void acquireReference() {
	synchronized(this) {		synchronized(this) {
	if (mReferenceCount <= 0) {		if (mReferenceCount <= 0) {
	@@ -35,6 +59,12 @@ public abstract class SQLiteClosable {
	}		}
	}		}

			/**
			* Releases a reference to the object, closing the object if the last reference
			* was released.
			*
			* @see #onAllReferencesReleased()
			*/
	public void releaseReference() {		public void releaseReference() {
	boolean refCountIsZero = false;		boolean refCountIsZero = false;
	synchronized(this) {		synchronized(this) {
	@@ -45,6 +75,14 @@ public abstract class SQLiteClosable {
	}		}
	}		}

			/**
			* Releases a reference to the object that was owned by the container of the object,
			* closing the object if the last reference was released.
			*
			* @see #onAllReferencesReleasedFromContainer()
			* @deprecated Do not use.
			*/
			@Deprecated
	public void releaseReferenceFromContainer() {		public void releaseReferenceFromContainer() {
	boolean refCountIsZero = false;		boolean refCountIsZero = false;
	synchronized(this) {		synchronized(this) {
	@@ -54,4 +92,17 @@ public abstract class SQLiteClosable {
	onAllReferencesReleasedFromContainer();		onAllReferencesReleasedFromContainer();
	}		}
	}		}

			/**
			* Releases a reference to the object, closing the object if the last reference
			* was released.
			*
			* Calling this method is equivalent to calling {@link #releaseReference}.
			*
			* @see #releaseReference()
			* @see #onAllReferencesReleased()
			*/
			public void close() {
			releaseReference();
			}
	}		}