back out bug 1025931 r=backout a=backout
authorBrad Lassey <blassey@mozilla.com>
Thu, 03 Jul 2014 11:55:48 -0400
changeset 207619 5657237fe9751b41b077c05cc5fab9b3b0fbd792
parent 207618 13aa5be377b0f61dc598d57e38f09736409342be
child 207620 d850cfb6a2ff4ec4a2ffa4c51942a48e5ef8b427
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1025931
milestone32.0a2
back out bug 1025931 r=backout a=backout
mobile/android/base/GeckoAppShell.java
mobile/android/base/GeckoApplication.java
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -2112,18 +2112,16 @@ public class GeckoAppShell
             return null;
         }
     }
 
     private static ContextGetter sContextGetter;
 
     @WrapElementForJNI(allowMultithread = true)
     public static Context getContext() {
-        if (sContextGetter == null)
-            return null;
         return sContextGetter.getContext();
     }
 
     public static void setContextGetter(ContextGetter cg) {
         sContextGetter = cg;
     }
 
     public static SharedPreferences getSharedPreferences() {
--- a/mobile/android/base/GeckoApplication.java
+++ b/mobile/android/base/GeckoApplication.java
@@ -97,18 +97,16 @@ public class GeckoApplication extends Ap
                 }
             });
         }
         GeckoConnectivityReceiver.getInstance().stop();
         GeckoNetworkManager.getInstance().stop();
     }
 
     public void onActivityResume(GeckoActivityStatus activity) {
-	GeckoAppShell.setContextGetter(this);
-
         if (mPausedGecko) {
             GeckoAppShell.sendEventToGecko(GeckoEvent.createAppForegroundingEvent());
             mPausedGecko = false;
         }
 
         final Context applicationContext = getApplicationContext();
         GeckoBatteryManager.getInstance().start(applicationContext);
         GeckoConnectivityReceiver.getInstance().start(applicationContext);