Bug 725858 - Don't load sqlite for migration if we're not migrating. …

…r=gcp
zpao · Feb 10, 2012 · eac87ea · eac87ea
1 parent 54cacf7
commit eac87ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
@@ -2328,21 +2328,21 @@ private String readUpdateStatus(File statusFile) {
 
     private void checkMigrateProfile() {
         File profileDir = getProfileDir();
+        long currentTime = SystemClock.uptimeMillis();
+
         if (profileDir != null) {
-            long currentTime = SystemClock.uptimeMillis();
             Log.i(LOGTAG, "checking profile migration in: " + profileDir.getAbsolutePath());
             final GeckoApp app = GeckoApp.mAppContext;
             final SetupScreen setupScreen = new SetupScreen(app);
             // don't show unless we take a while
             setupScreen.showDelayed(mMainHandler);
-            GeckoAppShell.ensureSQLiteLibsLoaded(app.getApplication().getPackageResourcePath());
             ProfileMigrator profileMigrator =
                 new ProfileMigrator(app.getContentResolver(), profileDir);
             profileMigrator.launch();
             setupScreen.dismiss();
-            long timeDiff = SystemClock.uptimeMillis() - currentTime;
-            Log.i(LOGTAG, "Profile migration took " + timeDiff + " ms");
         }
+        long timeDiff = SystemClock.uptimeMillis() - currentTime;
+        Log.i(LOGTAG, "Profile migration took " + timeDiff + " ms");
     }
 
     private SynchronousQueue<String> mFilePickerResult = new SynchronousQueue<String>();

diff --git a/mobile/android/base/ProfileMigrator.java b/mobile/android/base/ProfileMigrator.java
@@ -280,6 +280,7 @@ protected void migratePlaces(File aFile) {
             File dbFileShm = new File(dbPathShm);
 
             SQLiteBridge db = null;
+            GeckoAppShell.ensureSQLiteLibsLoaded(GeckoApp.mAppContext.getApplication().getPackageResourcePath());
             try {
                 db = new SQLiteBridge(dbPath);
                 migrateBookmarks(db);