summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2013-08-07 08:38:12 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-08-07 08:38:12 -0700
commitca4553d33fe779dcdf2daad4590e4dbcfec7b62f (patch)
treee73433972f76b2a1827598d3d72438ec17ac52ce
parentef54f611c1574c2cca89476494e7343df76aefad (diff)
parent7ffbcb2892e66059ec0cce26b4d6054c7778c711 (diff)
am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit '7ffbcb2892e66059ec0cce26b4d6054c7778c711': Guarantee that all db related files are deleted together.
-rwxr-xr-x[-rw-r--r--]core/java/android/database/DefaultDatabaseErrorHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/database/DefaultDatabaseErrorHandler.java b/core/java/android/database/DefaultDatabaseErrorHandler.java
index a9e39c321ac2..b234e348000e 100644..100755
--- a/core/java/android/database/DefaultDatabaseErrorHandler.java
+++ b/core/java/android/database/DefaultDatabaseErrorHandler.java
@@ -99,7 +99,7 @@ public final class DefaultDatabaseErrorHandler implements DatabaseErrorHandler {
}
Log.e(TAG, "deleting the database file: " + fileName);
try {
- new File(fileName).delete();
+ SQLiteDatabase.deleteDatabase(new File(fileName));
} catch (Exception e) {
/* print warning and ignore exception */
Log.w(TAG, "delete failed: " + e.getMessage());