commit b6bc32c9c6ed3ec90d602a729a7bfa7741896cf4
author Michael Kolb <kolby@google.com> Fri Dec 10 11:51:54 2010 -0800
committer Michael Kolb <kolby@google.com> Fri Dec 10 12:51:57 2010 -0800
tree 0edd56ba8927414fcf4105d4d132ff619cea78b4
parent e3e90c23337166065b1f68be7d82434df89b0691

Fix NPE in onDismiss

    Bug: http://b/issue?id=3224622
    Checking WebView added

Change-Id: I809a8bdcd94589981876cf4d566fd8825b850a87

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 5326280..99e86c4 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -33,6 +33,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
+import android.webkit.WebView;
 import android.widget.ImageView;
 
 /**
@@ -186,10 +187,16 @@
 
     @Override
     public void onDismiss() {
-        mUiController.getCurrentTopWebView().requestFocus();
+        WebView top = mUiController.getCurrentTopWebView();
+        if (top != null) {
+            mUiController.getCurrentTopWebView().requestFocus();
+        }
         ((BaseUi) mUiController.getUi()).hideFakeTitleBar();
         setUrlMode(false);
-        setDisplayTitle(mUiController.getCurrentWebView().getUrl());
+        // if top != null current must be set
+        if (top != null) {
+            setDisplayTitle(mUiController.getCurrentWebView().getUrl());
+        }
     }
 
     @Override