am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit

* commit '7a9cda18eb31b5ab47d7eca064374eaa6efdc268':
  Defend against missing DB during migration.

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());
     }