From bab16218f04b634810cabaceca9de6b7a611f93d Mon Sep 17 00:00:00 2001 From: Mark Finkle Date: Wed, 20 Feb 2013 13:32:32 -0500 Subject: [PATCH] Bug 842917 - Avoid nested transactions in onUpgrade r=lucasr --- mobile/android/base/db/BrowserProvider.java.in | 5 ----- mobile/android/base/db/TabsProvider.java.in | 5 ----- 2 files changed, 10 deletions(-) diff --git a/mobile/android/base/db/BrowserProvider.java.in b/mobile/android/base/db/BrowserProvider.java.in index 3939cf099d7..8775548bd3a 100644 --- a/mobile/android/base/db/BrowserProvider.java.in +++ b/mobile/android/base/db/BrowserProvider.java.in @@ -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 diff --git a/mobile/android/base/db/TabsProvider.java.in b/mobile/android/base/db/TabsProvider.java.in index 257d206ad12..5844525c364 100644 --- a/mobile/android/base/db/TabsProvider.java.in +++ b/mobile/android/base/db/TabsProvider.java.in @@ -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