Merge "if db close() fails due to un-closed sql statements, print useful msg"

1 files changed, 8 insertions, 7 deletions

diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 7efb7fd..184988b 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -1122,11 +1122,11 @@ public class SQLiteDatabase extends SQLiteClosable {
                 Map.Entry<SQLiteClosable, Object> entry = iter.next();
                 SQLiteClosable program = entry.getKey();
                 if (program != null && program instanceof SQLiteProgram) {
-                        SQLiteCompiledSql compiledSql = ((SQLiteProgram)program).mCompiledSql;
-                        if (compiledSql.nStatement == stmtId) {
-                            msg = compiledSql.toString();
-                            found = true;
-                        }
+                    SQLiteCompiledSql compiledSql = ((SQLiteProgram)program).mCompiledSql;
+                    if (compiledSql.nStatement == stmtId) {
+                        msg = compiledSql.toString();
+                        found = true;
+                    }
                 }
             }
             if (!found) {
@@ -1140,8 +1140,9 @@ public class SQLiteDatabase extends SQLiteClosable {
                 }
             } else {
                 // the statement is not yet closed. most probably programming error in the app.
-                Log.w(TAG, "dbclose failed due to un-close()d SQL statements: " + msg);
-                throw e;
+                throw new SQLiteUnfinalizedObjectsException(
+                        "close() on database: " + getPath() +
+                        " failed due to un-close()d SQL statements: " + msg);
             }
         }
     }