commit be68a3fcc8d0310812503c2178116b3f3d8b9a15
author John Reck <jreck@google.com> Mon Jul 18 09:42:53 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 18 09:42:53 2011 -0700
tree 0822fdbe542935da956e889ea372b3003c1b52a5
parent d156adfc7abd9667fed08fd2c9c065d480b0f457
parent f630b5590984e477cdc76a75b1c2edb9d73d144a

Merge "Closing last tab clears state"

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 1e1698b..b6d269d 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -79,8 +79,9 @@
             return;
         }
 
-        if (((AccessibilityManager) getSystemService(ACCESSIBILITY_SERVICE))
-                .isEnabled()) {
+        AccessibilityManager accessibilityManager = (AccessibilityManager)
+                getSystemService(ACCESSIBILITY_SERVICE);
+        if (accessibilityManager != null && accessibilityManager.isEnabled()) {
             setDefaultKeyMode(DEFAULT_KEYS_DISABLE);
         }