From e0d05127b0bdf6d34a8b20ce23a07f8411c9a70f Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Thu, 26 Jun 2014 09:37:47 -0400
Subject: [PATCH] bug 1025931 - Crash java.lang.NullPointerException in in
 org.mozilla.gecko.GeckoAppShell.getContext r=snorp

---
 mobile/android/base/GeckoAppShell.java    | 2 ++
 mobile/android/base/GeckoApplication.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java
index 433d06b6548..0be662a1d94 100644
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -2095,6 +2095,8 @@ public class GeckoAppShell
 
     @WrapElementForJNI(allowMultithread = true)
     public static Context getContext() {
+        if (sContextGetter == null)
+            return null;
         return sContextGetter.getContext();
     }
 
diff --git a/mobile/android/base/GeckoApplication.java b/mobile/android/base/GeckoApplication.java
index 6887073c55a..2c2f5d0d394 100644
--- a/mobile/android/base/GeckoApplication.java
+++ b/mobile/android/base/GeckoApplication.java
@@ -102,6 +102,8 @@ public class GeckoApplication extends Application
     }
 
     public void onActivityResume(GeckoActivityStatus activity) {
+	GeckoAppShell.setContextGetter(this);
+
         if (mPausedGecko) {
             GeckoAppShell.sendEventToGecko(GeckoEvent.createAppForegroundingEvent());
             mPausedGecko = false;