diff options
| -rw-r--r-- | api/current.txt | 5 | ||||
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 2 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteDatabase.java | 35 |
3 files changed, 39 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 5babf23..4ab5511 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7275,6 +7275,7 @@ package android.database.sqlite { method public android.database.sqlite.SQLiteStatement compileStatement(java.lang.String) throws android.database.SQLException; method public static android.database.sqlite.SQLiteDatabase create(android.database.sqlite.SQLiteDatabase.CursorFactory); method public int delete(java.lang.String, java.lang.String, java.lang.String[]); + method public static boolean deleteDatabase(java.io.File); method public boolean enableWriteAheadLogging(); method public void endTransaction(); method public void execSQL(java.lang.String) throws android.database.SQLException; @@ -7392,8 +7393,8 @@ package android.database.sqlite { ctor public SQLiteOpenHelper(android.content.Context, java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler); method public synchronized void close(); method public java.lang.String getDatabaseName(); - method public synchronized android.database.sqlite.SQLiteDatabase getReadableDatabase(); - method public synchronized android.database.sqlite.SQLiteDatabase getWritableDatabase(); + method public android.database.sqlite.SQLiteDatabase getReadableDatabase(); + method public android.database.sqlite.SQLiteDatabase getWritableDatabase(); method public abstract void onCreate(android.database.sqlite.SQLiteDatabase); method public void onDowngrade(android.database.sqlite.SQLiteDatabase, int, int); method public void onOpen(android.database.sqlite.SQLiteDatabase); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 6d5cce5..e348b87 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -785,7 +785,7 @@ class ContextImpl extends Context { public boolean deleteDatabase(String name) { try { File f = validateFilePath(name, false); - return f.delete(); + return SQLiteDatabase.deleteDatabase(f); } catch (Exception e) { } return false; diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 515658f..2f3dc06 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -36,6 +36,7 @@ import android.util.Printer; import dalvik.system.CloseGuard; import java.io.File; +import java.io.FileFilter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -678,6 +679,40 @@ public class SQLiteDatabase extends SQLiteClosable { } /** + * Deletes a database including its journal file and other auxiliary files + * that may have been created by the database engine. + * + * @param file The database file path. + * @return True if the database was successfully deleted. + */ + public static boolean deleteDatabase(File file) { + if (file == null) { + throw new IllegalArgumentException("file must not be null"); + } + + boolean deleted = false; + deleted |= file.delete(); + deleted |= new File(file.getPath() + "-journal").delete(); + deleted |= new File(file.getPath() + "-shm").delete(); + deleted |= new File(file.getPath() + "-wal").delete(); + + File dir = file.getParentFile(); + if (dir != null) { + final String prefix = file.getName() + "-mj"; + final FileFilter filter = new FileFilter() { + @Override + public boolean accept(File candidate) { + return candidate.getName().startsWith(prefix); + } + }; + for (File masterJournal : dir.listFiles(filter)) { + deleted |= masterJournal.delete(); + } + } + return deleted; + } + + /** * Reopens the database in read-write mode. * If the database is already read-write, does nothing. * |