am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit

* commit '7a9cda18eb31b5ab47d7eca064374eaa6efdc268':
  Defend against missing DB during migration.
This commit is contained in:
Dan Sandler
2014-01-24 21:02:03 -08: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());
}