commit a6fa1f1e14c9de468512fa700a5ccaa7f358105a
author John Reck <jreck@google.com> Wed May 30 16:52:38 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 30 16:52:38 2012 -0700
tree 2b8a14b8cdaf86299546b2dcb14651d21fc25c15
parent 52d2a5a891c86db71f6f104d8612fd0d620dd539
parent 48b66727485a789489568ad4fe0392c8d3f8e52d

am 48b66727: am ed19512a: Merge "Add null check" into jb-dev

* commit '48b66727485a789489568ad4fe0392c8d3f8e52d':
  Add null check

src/com/android/browser/TitleBar.java

diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index d3e8f7c..f5be5d3 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -406,7 +406,7 @@
     @Override
     public View focusSearch(View focused, int dir) {
         WebView web = getCurrentWebView();
-        if (FOCUS_DOWN == dir && hasFocus()
+        if (FOCUS_DOWN == dir && hasFocus() && web != null
                 && web.hasFocusable() && web.getParent() != null) {
             return web;
         }