From bf1edc035fe442f4c03b1b3ad65ebf347c797cd4 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 16 Feb 2011 12:02:10 -0500
Subject: [PATCH] bug 634530 - Fennec fails to startup on Droid Pro when the
 device is connected to PC via USB r=mbrubeck a=blocking-fennec CLOSED TREE

---
 embedding/android/GeckoAppShell.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/embedding/android/GeckoAppShell.java b/embedding/android/GeckoAppShell.java
index 9e7a2de7c9..5968ddf5d8 100644
--- a/embedding/android/GeckoAppShell.java
+++ b/embedding/android/GeckoAppShell.java
@@ -216,7 +216,7 @@ class GeckoAppShell
             if (Build.VERSION.SDK_INT >= 8) {
                 File extHome =  geckoApp.getExternalFilesDir(null);
                 File extProf = new File (extHome, "mozilla");
-                if (extHome.exists())
+                if (extHome != null && extProf != null && extProf.exists())
                     moveDir(extProf, profileDir);
             }
         } else {
@@ -231,7 +231,7 @@ class GeckoAppShell
 
             File intHome =  geckoApp.getFilesDir();
             File intProf = new File(intHome, "mozilla");
-            if (intHome.exists())
+            if (intHome != null && intProf != null && intProf.exists())
                 moveDir(intProf, profileDir);
         }
         GeckoAppShell.putenv("HOME=" + homeDir);
-- 
2.11.4.GIT