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

* commit '8944f244d55a5f60cfb4d69b464c5694d11d097d':
  Defend against missing DB during migration.
This commit is contained in:
Ian Parkinson
2014-02-15 00:20:32 +00:00
committed by Android Git Automerger
@@ -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());
}