Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dbb9cee authored by Vasu Nori's avatar Vasu Nori
Browse files

accept close() on database objects even if the database is closed 

bug:2602878
Change-Id: I3075f801ef35d72792ff3daaa1e887e53b58f5f8
parent f066611a

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

+0 −3
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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 {