summaryrefslogtreecommitdiffstats
path: root/core/java/android/database
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-08-08 14:14:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-08 14:14:06 -0700
commitd6aa247155221b42ac96daa9b633c2a63bd945ed (patch)
tree706b0f1b07f857c0bd869448faf262a8614ae397 /core/java/android/database
parent672d323bb49723f843e086dd03ef977f836c5214 (diff)
parentca4553d33fe779dcdf2daad4590e4dbcfec7b62f (diff)
downloadframeworks_base-d6aa247155221b42ac96daa9b633c2a63bd945ed.zip
frameworks_base-d6aa247155221b42ac96daa9b633c2a63bd945ed.tar.gz
frameworks_base-d6aa247155221b42ac96daa9b633c2a63bd945ed.tar.bz2
am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit 'ca4553d33fe779dcdf2daad4590e4dbcfec7b62f': Guarantee that all db related files are deleted together.
Diffstat (limited to 'core/java/android/database')
-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 a9e39c3..b234e34 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());