Merge "accept close() on database objects even if the database is closed" into froyo

core/java/android/database/sqlite/SQLiteCompiledSql.java

@@ -96,9 +96,6 @@ import android.util.Log;
     }
 
     /* package */ void releaseSqlStatement() {
-        if (!mDatabase.isOpen()) {
-            throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
-        }
         // Note that native_finalize() checks to make sure that nStatement is
         // non-null before destroying it.
         if (nStatement != 0) {

core/java/android/database/sqlite/SQLiteProgram.java

@@ -286,7 +286,7 @@ public abstract class SQLiteProgram extends SQLiteClosable {
      */
     public void close() {
         if (!mDatabase.isOpen()) {
-            throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
+            return;
         }
         mDatabase.lock();
         try {