commit 68f99541fd76a53277118800b967453f88d74044
author Ian Parkinson <ianp@google.com> Sat Feb 15 00:24:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Feb 15 00:24:02 2014 +0000
tree 29151f6460b391abaa2da31321890dd6729d3b0b
parent 575f1c6625b468712f2aa37e68cf0835e65f8f78
parent 6b524fe0b23cb698154896415290eef94f4b7ae5

am 6b524fe0: am 8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-release

* commit '6b524fe0b23cb698154896415290eef94f4b7ae5':
  Defend against missing DB during migration.

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