--- a/uriloader/exthandler/android/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/android/nsOSHelperAppService.cpp
@@ -32,30 +32,35 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsOSHelperAppService.h"
 #include "nsMIMEInfoAndroid.h"
+#include "AndroidBridge.h"
 
 nsOSHelperAppService::nsOSHelperAppService() : nsExternalHelperAppService()
 {
 }
 
 nsOSHelperAppService::~nsOSHelperAppService()
 {
 }
 
 already_AddRefed<nsIMIMEInfo>
 nsOSHelperAppService::GetMIMEInfoFromOS(const nsACString& aMIMEType,
                                         const nsACString& aFileExt,
                                         PRBool* aFound)
 {
+    // XXX Bug 579388 - need to remote this
+    if (!mozilla::AndroidBridge::Bridge())
+        return nsnull;
+
     *aFound = PR_FALSE;
     already_AddRefed<nsIMIMEInfo> mimeInfo = 
             nsMIMEInfoAndroid::GetMimeInfoForMimeType(aMIMEType);
     if (!mimeInfo.get())
             mimeInfo = nsMIMEInfoAndroid::GetMimeInfoForFileExt(aFileExt);
 
     *aFound = !!mimeInfo.get();
     

--- a/widget/src/android/nsWindow.cpp
+++ b/widget/src/android/nsWindow.cpp
@@ -473,16 +473,19 @@ nsWindow::FindTopLevel()
 
 NS_IMETHODIMP
 nsWindow::SetFocus(PRBool aRaise)
 {
     if (!aRaise)
         ALOG("nsWindow::SetFocus: can't set focus without raising, ignoring aRaise = false!");
 
     gFocusedWindow = this;
+    if (!AndroidBridge::Bridge())
+        return NS_OK;
+
     FindTopLevel()->BringToFront();
 
     return NS_OK;
 }
 
 void
 nsWindow::BringToFront()
 {
@@ -573,16 +576,19 @@ nsWindow::GetThebesSurface()
     // XXX this really wants to return already_AddRefed, but this only really gets used
     // on direct assignment to a gfxASurface
     return new gfxImageSurface(gfxIntSize(5,5), gfxImageSurface::ImageFormatRGB24);
 }
 
 void
 nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
 {
+    if (!AndroidBridge::Bridge())
+        return;
+
     switch (ae->Type()) {
         case AndroidGeckoEvent::SIZE_CHANGED: {
             int nw = ae->P0().x;
             int nh = ae->P0().y;
 
             if (nw == gAndroidBounds.width &&
                 nh == gAndroidBounds.height) {
                 return;
@@ -650,16 +656,19 @@ nsWindow::OnGlobalAndroidEvent(AndroidGe
         default:
             break;
     }
 }
 
 void
 nsWindow::OnAndroidEvent(AndroidGeckoEvent *ae)
 {
+    if (!AndroidBridge::Bridge())
+        return;
+
     switch (ae->Type()) {
         case AndroidGeckoEvent::DRAW:
             OnDraw(ae);
             break;
 
         default:
             ALOG("Window got targetted android event type %d, but didn't handle!", ae->Type());
             break;