am 2bb47f3b: Merge "fix NPE in dispatchKeyEvents" into honeycomb-mr1

* commit '2bb47f3b59980effa1fba672fa6e67ad32efea56':
  fix NPE in dispatchKeyEvents

1 files changed, 17 insertions, 16 deletions

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index fdb72e5..d940b50 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -468,22 +468,23 @@ public class XLargeUi extends BaseUi implements ScrollListener {
 
     @Override
     public boolean dispatchKey(int code, KeyEvent event) {
-        WebView web = getActiveTab().getWebView();
-        if (event.getAction() == KeyEvent.ACTION_DOWN) {
-
-            switch (code) {
-                case KeyEvent.KEYCODE_TAB:
-                case KeyEvent.KEYCODE_DPAD_UP:
-                case KeyEvent.KEYCODE_DPAD_LEFT:
-                    if ((web != null) && web.hasFocus() && !mTitleBar.hasFocus()) {
-                        editUrl(false);
-                        return true;
-                    }
-            }
-            boolean ctrl = event.hasModifiers(KeyEvent.META_CTRL_ON);
-            if (!ctrl && isTypingKey(event) && !mTitleBar.isEditingUrl()) {
-                editUrl(true);
-                return mContentView.dispatchKeyEvent(event);
+        if (mActiveTab != null) {
+            WebView web = mActiveTab.getWebView();
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                switch (code) {
+                    case KeyEvent.KEYCODE_TAB:
+                    case KeyEvent.KEYCODE_DPAD_UP:
+                    case KeyEvent.KEYCODE_DPAD_LEFT:
+                        if ((web != null) && web.hasFocus() && !mTitleBar.hasFocus()) {
+                            editUrl(false);
+                            return true;
+                        }
+                }
+                boolean ctrl = event.hasModifiers(KeyEvent.META_CTRL_ON);
+                if (!ctrl && isTypingKey(event) && !mTitleBar.isEditingUrl()) {
+                    editUrl(true);
+                    return mContentView.dispatchKeyEvent(event);
+                }
             }
         }
         return false;