diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/TitleBarXLarge.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java index 5326280f8..99e86c464 100644 --- a/src/com/android/browser/TitleBarXLarge.java +++ b/src/com/android/browser/TitleBarXLarge.java @@ -33,6 +33,7 @@ import android.view.LayoutInflater; 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 @@ public class TitleBarXLarge extends TitleBarBase @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 |