diff options
| author | Dan Sandler <dsandler@android.com> | 2014-01-21 14:14:41 -0500 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:27 -0700 |
| commit | 624700f9b11cde22d8050cf9bb2010e9e05ec430 (patch) | |
| tree | d627a8ee7580e2bcff2a7033d2c8603b482319f9 /src/com/android | |
| parent | e1940a6731f8dcf81062dc80344b4d437f00f62e (diff) | |
| download | android_packages_apps_Trebuchet-624700f9b11cde22d8050cf9bb2010e9e05ec430.tar.gz android_packages_apps_Trebuchet-624700f9b11cde22d8050cf9bb2010e9e05ec430.tar.bz2 android_packages_apps_Trebuchet-624700f9b11cde22d8050cf9bb2010e9e05ec430.zip | |
Defend against missing DB during migration.
Bug: 12600784
Change-Id: Ie295d2ac970eab798b9826748d400cd30a04662d
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index eaaa960d1..f14c71ace 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -328,9 +328,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()); } |