From 0dbb9cee58d35d30f205dc844a82e960149fa86b Mon Sep 17 00:00:00 2001
From: Vasu Nori <vnori@google.com>
Date: Fri, 16 Apr 2010 14:24:57 -0700
Subject: [PATCH] accept close() on database objects even if the database is
 closed

bug:2602878
Change-Id: I3075f801ef35d72792ff3daaa1e887e53b58f5f8
---
 core/java/android/database/sqlite/SQLiteCompiledSql.java | 3 ---
 core/java/android/database/sqlite/SQLiteProgram.java     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/java/android/database/sqlite/SQLiteCompiledSql.java b/core/java/android/database/sqlite/SQLiteCompiledSql.java
index 047e1769d3ea..25aa9b378554 100644
--- a/core/java/android/database/sqlite/SQLiteCompiledSql.java
+++ b/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) {
diff --git a/core/java/android/database/sqlite/SQLiteProgram.java b/core/java/android/database/sqlite/SQLiteProgram.java
index 5f13eb192e99..89a5f0d1e983 100644
--- a/core/java/android/database/sqlite/SQLiteProgram.java
+++ b/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 {