back out bug 1025931 r=backout a=backout
authorBrad Lassey <blassey@mozilla.com>
Thu, 03 Jul 2014 11:55:48 -0400
changeset 192160 543c2448130b259de22e14e504aaba9257199dd2
parent 192159 34e8a8a7603b21098625690ecfaabe264cec33bb
child 192161 610cfd0139c1a495613ac7dbe568f73ab33d09fe
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersbackout, backout
bugs1025931
milestone33.0a1
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
@@ -2090,18 +2090,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);