mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 842917 - Avoid nested transactions in onUpgrade r=lucasr
This commit is contained in:
parent
c8f0394d0c
commit
bab16218f0
@ -1636,8 +1636,6 @@ public class BrowserProvider extends ContentProvider {
|
||||
debug("Upgrading browser.db: " + db.getPath() + " from " +
|
||||
oldVersion + " to " + newVersion);
|
||||
|
||||
db.beginTransaction();
|
||||
|
||||
// We have to do incremental upgrades until we reach the current
|
||||
// database schema version.
|
||||
for (int v = oldVersion + 1; v <= newVersion; v++) {
|
||||
@ -1705,9 +1703,6 @@ public class BrowserProvider extends ContentProvider {
|
||||
&& !mContext.deleteDatabase(Obsolete.FAVICON_DB)) {
|
||||
throw new SQLException("Could not delete " + Obsolete.FAVICON_DB);
|
||||
}
|
||||
|
||||
db.setTransactionSuccessful();
|
||||
db.endTransaction();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -174,8 +174,6 @@ public class TabsProvider extends ContentProvider {
|
||||
debug("Upgrading tabs.db: " + db.getPath() + " from " +
|
||||
oldVersion + " to " + newVersion);
|
||||
|
||||
db.beginTransaction();
|
||||
|
||||
// We have to do incremental upgrades until we reach the current
|
||||
// database schema version.
|
||||
for (int v = oldVersion + 1; v <= newVersion; v++) {
|
||||
@ -185,9 +183,6 @@ public class TabsProvider extends ContentProvider {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
db.setTransactionSuccessful();
|
||||
db.endTransaction();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Loading…
Reference in New Issue
Block a user