diff options
| author | Ian Parkinson <ianp@google.com> | 2014-02-15 00:20:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-15 00:20:32 +0000 |
| commit | 6b524fe0b23cb698154896415290eef94f4b7ae5 (patch) | |
| tree | 29151f6460b391abaa2da31321890dd6729d3b0b | |
| parent | c027560893d994d675d55bb79e60cb2c47189f3c (diff) | |
| parent | 8944f244d55a5f60cfb4d69b464c5694d11d097d (diff) | |
| download | android_packages_apps_Trebuchet-6b524fe0b23cb698154896415290eef94f4b7ae5.tar.gz android_packages_apps_Trebuchet-6b524fe0b23cb698154896415290eef94f4b7ae5.tar.bz2 android_packages_apps_Trebuchet-6b524fe0b23cb698154896415290eef94f4b7ae5.zip | |
am 8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-release
* commit '8944f244d55a5f60cfb4d69b464c5694d11d097d':
Defend against missing DB during migration.
| -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 eca776931..52bcf98e7 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -325,9 +325,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()); } |