diff options
| author | Dan Sandler <dsandler@android.com> | 2014-01-25 05:00:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-25 05:00:33 +0000 |
| commit | 7a9cda18eb31b5ab47d7eca064374eaa6efdc268 (patch) | |
| tree | bfaf0b393a8854663f7b6a57b9b13eee9ed32bee | |
| parent | 2aaf6e339000646501bc3d73e497a365174fad26 (diff) | |
| parent | 2b4717447e7afddf1011875fe70971b6e105f4c5 (diff) | |
| download | android_packages_apps_Trebuchet-7a9cda18eb31b5ab47d7eca064374eaa6efdc268.tar.gz android_packages_apps_Trebuchet-7a9cda18eb31b5ab47d7eca064374eaa6efdc268.tar.bz2 android_packages_apps_Trebuchet-7a9cda18eb31b5ab47d7eca064374eaa6efdc268.zip | |
Merge "Defend against missing DB during migration." into jb-ub-now-kermit
| -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()); } |