PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 523e762ad4 7a9cda18eb
commit 947ef4e7ab
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherProvider.java
+4 -2
View File
@@ -325,9 +325,11 @@ public class LauncherProvider extends ContentProvider {
public void deleteDatabase() { public void deleteDatabase() {
// Are you sure? (y/n) // Are you sure? (y/n)
final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
final String dbFile = db.getPath(); final File dbFile = new File(db.getPath());
mOpenHelper.close(); mOpenHelper.close();
SQLiteDatabase.deleteDatabase(new File(dbFile)); if (dbFile.exists()) {
SQLiteDatabase.deleteDatabase(dbFile);
}
mOpenHelper = new DatabaseHelper(getContext()); mOpenHelper = new DatabaseHelper(getContext());
} }