diff options
| author | yi.jang <yi.jang@lge.com> | 2013-07-11 09:52:12 +0900 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-08-09 11:58:15 -0700 |
| commit | 44e16031550929a5e840aa61dcb4246ff1f691d9 (patch) | |
| tree | 5d46ef67b7e1c3fdef6355b8ca5ccc76480f8370 /src | |
| parent | 5673236ebe98bbbc47c433d9f08e54a4f8f5d282 (diff) | |
| download | android_packages_apps_Email-44e16031550929a5e840aa61dcb4246ff1f691d9.tar.gz android_packages_apps_Email-44e16031550929a5e840aa61dcb4246ff1f691d9.tar.bz2 android_packages_apps_Email-44e16031550929a5e840aa61dcb4246ff1f691d9.zip | |
Use deleteDatabase method to improve safety of DB file handling
Deleting .db files can make malformed database issues
when WAL(write ahead logging) mode is enabled.
EmailProvider doesn't use WAL mode currently,
But it has to be fixed because it might cause the problem in the
future.
Change-Id: Ie0313c5d253f3080401b00b197e7cbf97f25423c
Conflicts:
src/com/android/email/provider/EmailProvider.java
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/email/provider/EmailProvider.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index fa340b733..e48326455 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -989,16 +989,16 @@ public class EmailProvider extends ContentProvider { mBodyDatabase = null; } // Look for orphans, and delete as necessary; these must always be in sync - File databaseFile = getContext().getDatabasePath(DATABASE_NAME); - File bodyFile = getContext().getDatabasePath(BODY_DATABASE_NAME); + final File databaseFile = getContext().getDatabasePath(DATABASE_NAME); + final File bodyFile = getContext().getDatabasePath(BODY_DATABASE_NAME); // TODO Make sure attachments are deleted if (databaseFile.exists() && !bodyFile.exists()) { LogUtils.w(TAG, "Deleting orphaned EmailProvider database..."); - databaseFile.delete(); + getContext().deleteDatabase(DATABASE_NAME); } else if (bodyFile.exists() && !databaseFile.exists()) { LogUtils.w(TAG, "Deleting orphaned EmailProviderBody database..."); - bodyFile.delete(); + getContext().deleteDatabase(BODY_DATABASE_NAME); } } @Override |