am 4eb312fa: Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1

* commit '4eb312faf9d7850dee4a1f10a41b343a4c923c03':
  Fix NPE in NavigationBarBase.onAction

1 files changed, 5 insertions, 1 deletions

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.KeyEvent;
 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 @@ public class NavigationBarBase extends LinearLayout implements
      */
     @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();