backout 83e4a240abc0
authorWes Johnston <wjohnston@mozilla.com>
Fri, 10 Feb 2012 10:48:48 -0800
changeset 86619 d83905d0154b2cbd19a40b027edbe5affeab879d
parent 86618 1c3efb9a3fed5da2d05218d36fb76f9889c06dfb
child 86620 3852b3874127f06ac21d11189a6eb9e47e5e54b1
push id5946
push userwjohnston@mozilla.com
push dateFri, 10 Feb 2012 18:49:14 +0000
treeherdermozilla-inbound@d83905d0154b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone13.0a1
backs out83e4a240abc0735e37d9fb6cbf442720a3e93f66
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
backout 83e4a240abc0
mobile/android/base/GeckoApp.java
mobile/android/base/ProfileMigrator.java
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -2316,32 +2316,32 @@ abstract public class GeckoApp
             reader.close();
         } catch (Exception e) {
             Log.i(LOGTAG, "error reading update status", e);
         }
         return status;
     }
 
     private void checkMigrateProfile() {
-        long currentTime = SystemClock.uptimeMillis();
-        Log.i(LOGTAG, "checking profile migration in: " + profileDir.getAbsolutePath());
-
         File profileDir = getProfileDir();
         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>();
     public String showFilePicker(String aMimeType) {
         Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
         intent.addCategory(Intent.CATEGORY_OPENABLE);
         intent.setType(aMimeType);
         GeckoApp.this.
--- a/mobile/android/base/ProfileMigrator.java
+++ b/mobile/android/base/ProfileMigrator.java
@@ -275,17 +275,16 @@ public class ProfileMigrator {
             if (!dbFile.exists()) {
                 Log.i(LOGTAG, "No database");
                 return;
             }
             File dbFileWal = new File(dbPathWal);
             File dbFileShm = new File(dbPathShm);
 
             SQLiteBridge db = null;
-            GeckoAppShell.ensureSQLiteLibsLoaded(GeckoApp.mAppContext.getApplication().getPackageResourcePath());
             try {
                 db = new SQLiteBridge(dbPath);
                 migrateBookmarks(db);
                 migrateHistory(db);
                 db.close();
 
                 // Clean up
                 dbFile.delete();