diff options
author | Dan Sandler <dsandler@android.com> | 2014-01-24 21:02:03 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-24 21:02:03 -0800 |
commit | 947ef4e7ab4cc303fc708ee45a241969ca7ebbdc (patch) | |
tree | 1dab9a8c7b5edbd65a358282ddd9018f37191b7d /src/com/android | |
parent | 523e762ad43aaacbf494d207b9556d4f827d26c2 (diff) | |
parent | 7a9cda18eb31b5ab47d7eca064374eaa6efdc268 (diff) | |
download | android_packages_apps_Trebuchet-947ef4e7ab4cc303fc708ee45a241969ca7ebbdc.tar.gz android_packages_apps_Trebuchet-947ef4e7ab4cc303fc708ee45a241969ca7ebbdc.tar.bz2 android_packages_apps_Trebuchet-947ef4e7ab4cc303fc708ee45a241969ca7ebbdc.zip |
am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit
* commit '7a9cda18eb31b5ab47d7eca064374eaa6efdc268':
Defend against missing DB during migration.
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index eca776931..52bcf98e7 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -325,9 +325,11 @@ public class LauncherProvider extends ContentProvider { public void deleteDatabase() { // Are you sure? (y/n) final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); - final String dbFile = db.getPath(); + final File dbFile = new File(db.getPath()); mOpenHelper.close(); - SQLiteDatabase.deleteDatabase(new File(dbFile)); + if (dbFile.exists()) { + SQLiteDatabase.deleteDatabase(dbFile); + } mOpenHelper = new DatabaseHelper(getContext()); } |