corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 842681 - Call GeckoLoader.loadMozGlue from GeckoApplication.onCreate instead of GeckoApp.onCreate. r=kats

Browse Source
This commit is contained in:
Mike Hommey
2013-03-08 09:27:46 +01:00
parent a6da2dc544
commit 9f1e51d20e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/GeckoApp.java
View File

@@ -13,7 +13,6 @@ import org.mozilla.gecko.gfx.LayerView;
import org.mozilla.gecko.gfx.PanZoomController; import org.mozilla.gecko.gfx.PanZoomController;
import org.mozilla.gecko.gfx.PluginLayer; import org.mozilla.gecko.gfx.PluginLayer;
import org.mozilla.gecko.gfx.PointUtils; import org.mozilla.gecko.gfx.PointUtils;
import org.mozilla.gecko.mozglue.GeckoLoader;
import org.mozilla.gecko.updater.UpdateService; import org.mozilla.gecko.updater.UpdateService;
import org.mozilla.gecko.updater.UpdateServiceHelper; import org.mozilla.gecko.updater.UpdateServiceHelper;
import org.mozilla.gecko.util.GeckoBackgroundThread; import org.mozilla.gecko.util.GeckoBackgroundThread;
@@ -1361,7 +1360,6 @@ abstract public class GeckoApp
return; return;
} }
GeckoLoader.loadMozGlue(this);
if (sGeckoThread != null) { if (sGeckoThread != null) {
// this happens when the GeckoApp activity is destroyed by android // this happens when the GeckoApp activity is destroyed by android
// without killing the entire application (see bug 769269) // without killing the entire application (see bug 769269)

7
mobile/android/base/GeckoApplication.java
View File

@@ -5,6 +5,7 @@
package org.mozilla.gecko; package org.mozilla.gecko;
import android.app.Application; import android.app.Application;
import org.mozilla.gecko.mozglue.GeckoLoader;
public class GeckoApplication extends Application { public class GeckoApplication extends Application {
@@ -61,6 +62,12 @@ public class GeckoApplication extends Application {
mInBackground = false; mInBackground = false;
} }
@Override
public void onCreate() {
GeckoLoader.loadMozGlue(getApplicationContext());
super.onCreate();
}
public boolean isApplicationInBackground() { public boolean isApplicationInBackground() {
return mInBackground; return mInBackground;
} }