commit fa6177a41a0a2fc4c76173a16af1b0070703e883
author John Reck <jreck@google.com> Tue Nov 15 14:51:11 2011 -0800
committer John Reck <jreck@google.com> Tue Nov 15 14:51:11 2011 -0800
tree ae8bc7d30e37d51b9a3b2d7da6f712fae8b6dce1
parent bb0b166023502a3d5f68e166c7d009e6921b2417

Fix NPE in NavigationBarBase.onAction

 Bug: 5476078

Change-Id: Ic21f45656b473a09709e53274f1f90312bcba920

src/com/android/browser/NavigationBarBase.java

diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index bfdd9a0..6a1b340 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -27,6 +27,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
+import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
@@ -177,7 +178,10 @@
      */
     @Override
     public void onAction(String text, String extra, String source) {
-        mUiController.getCurrentTopWebView().requestFocus();
+        WebView currentTopWebView = mUiController.getCurrentTopWebView();
+        if (currentTopWebView != null) {
+            currentTopWebView.requestFocus();
+        }
         if (UrlInputView.TYPED.equals(source)) {
             String url = UrlUtils.smartUrlFilter(text, false);
             Tab t = mBaseUi.getActiveTab();