commit 7a9cda18eb31b5ab47d7eca064374eaa6efdc268
author Dan Sandler <dsandler@android.com> Sat Jan 25 05:00:32 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 25 05:00:33 2014 +0000
tree bfaf0b393a8854663f7b6a57b9b13eee9ed32bee
parent 2aaf6e339000646501bc3d73e497a365174fad26
parent 2b4717447e7afddf1011875fe70971b6e105f4c5

Merge "Defend against missing DB during migration." into jb-ub-now-kermit

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index eca7769..52bcf98 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -325,9 +325,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());
     }