From 2b4717447e7afddf1011875fe70971b6e105f4c5 Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Tue, 21 Jan 2014 14:14:41 -0500 Subject: Defend against missing DB during migration. Bug: 12600784 Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d --- src/com/android/launcher3/LauncherProvider.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index c797cc412..977446b01 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -321,9 +321,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()); } -- cgit v1.2.3