3 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 1e1698b5a..b6d269de8 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -79,8 +79,9 @@ public class BrowserActivity extends Activity {
             return;
         }
 
-        if (((AccessibilityManager) getSystemService(ACCESSIBILITY_SERVICE))
-                .isEnabled()) {
+        AccessibilityManager accessibilityManager = (AccessibilityManager)
+                getSystemService(ACCESSIBILITY_SERVICE);
+        if (accessibilityManager != null && accessibilityManager.isEnabled()) {
             setDefaultKeyMode(DEFAULT_KEYS_DISABLE);
         }
 
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 75129496f..96590632f 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2293,6 +2293,7 @@ public class Controller
         // hide combo view if open
         removeComboView();
         if (mTabControl.getTabCount() == 1) {
+            CrashRecoveryHandler.clearState(mActivity);
             mActivity.finish();
             return;
         }
diff --git a/src/com/android/browser/CrashRecoveryHandler.java b/src/com/android/browser/CrashRecoveryHandler.java
index ca538bd42..55fa6f850 100644
--- a/src/com/android/browser/CrashRecoveryHandler.java
+++ b/src/com/android/browser/CrashRecoveryHandler.java
@@ -134,7 +134,7 @@ public class CrashRecoveryHandler {
 
     }
 
-    private static void clearState(Context context) {
+    public static void clearState(Context context) {
         File state = new File(context.getCacheDir(), STATE_FILE);
         if (state.exists()) {
             state.delete();