commit 2b4717447e7afddf1011875fe70971b6e105f4c5
author Dan Sandler <dsandler@android.com> Tue Jan 21 14:14:41 2014 -0500
committer Dan Sandler <dsandler@android.com> Tue Jan 21 14:14:41 2014 -0500
tree 7e61f3b5925baa4be497f52d6f00dab7e9c2fdf0
parent a4db090b1345038a89a38ba8af6ac74f71e2ed7c

Defend against missing DB during migration.

Bug: 12600784
Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index c797cc4..977446b 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -321,9 +321,11 @@
     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());
     }