commit e6843ded7f8db1d99d42e8ccde706a35dda39755
author Android (Google) Code Review <android-gerrit@google.com> Mon Sep 21 16:45:11 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 21 16:45:11 2009 -0400
tree 7649f9152b7d5b5028f229870a7a07857078100f
parent cd921352dd09c208258e85fa5926b4e3a1b34f4d
parent f8de8ecc321fe5b45846adc38d174d5bc2208f20

Merge change 26235 into eclair

* changes:
  Check for a valid token before adding the fake title bar.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index dc85ec0..7f8c0c6 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -950,8 +950,10 @@
     }
 
     private void showFakeTitleBar() {
+        final View decor = getWindow().peekDecorView();
         if (mFakeTitleBar == null && mActiveTabsPage == null
-                && !mActivityInPause) {
+                && !mActivityInPause && decor != null
+                && decor.getWindowToken() != null) {
             final WebView webView = getTopWindow();
             mFakeTitleBar = new TitleBar(this);
             mFakeTitleBar.setTitleAndUrl(null, webView.getUrl());