when closing db, close all pending statements also

Change-Id: Ia543933e0cd70852c4e60623de698bb51b976900

1 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 2fa2e99f966f..f723dc8e65ac 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -365,7 +365,8 @@ public class SQLiteDatabase extends SQLiteClosable {
     @Override
     protected void onAllReferencesReleased() {
         if (isOpen()) {
-            dbclose();
+            // close the database which will close all pending statements to be finalized also
+            close();
         }
     }
 
@@ -1042,7 +1043,7 @@ public class SQLiteDatabase extends SQLiteClosable {
             // finalize ALL statements queued up so far
             closePendingStatements();
             // close this database instance - regardless of its reference count value
-            onAllReferencesReleased();
+            dbclose();
             if (mConnectionPool != null) {
                 mConnectionPool.close();
             }