diff options
| author | Michael Kolb <kolby@google.com> | 2011-03-08 13:26:59 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-08 13:26:59 -0800 |
| commit | 2bb47f3b59980effa1fba672fa6e67ad32efea56 (patch) | |
| tree | a9d7592502588b0c8edd9f70e33650da7cd8a843 | |
| parent | 4975d0cab83b1a8904515ed50f3ef1c64104517f (diff) | |
| parent | dfe99a1ad8fa39277b0b8279f42e4380db4bf674 (diff) | |
| download | packages_apps_Browser-2bb47f3b59980effa1fba672fa6e67ad32efea56.zip packages_apps_Browser-2bb47f3b59980effa1fba672fa6e67ad32efea56.tar.gz packages_apps_Browser-2bb47f3b59980effa1fba672fa6e67ad32efea56.tar.bz2 | |
Merge "fix NPE in dispatchKeyEvents" into honeycomb-mr1
| -rw-r--r-- | src/com/android/browser/XLargeUi.java | 33 |
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; |