From 03b6bc6dc3644e9843f2ff05bca543e546fe3a61 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Fri, 2 Sep 2011 16:19:53 -0700
Subject: Fix NPE in setActiveTab

    Bug: 5248939 5214748
    The second bug is actually different, and was not repeatable
    but the first case is now protected

Change-Id: I26f16ee3a828f6e9208c02cde89faa43a0423428
---
 src/com/android/browser/BaseUi.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 17ba4d7..bce3257 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -247,8 +247,7 @@ public abstract class BaseUi implements UI {
         setShouldShowErrorConsole(tab, mUiController.shouldShowErrorConsole());
         onTabDataChanged(tab);
         onProgressChanged(tab);
-        boolean incognito = mActiveTab.getWebView().isPrivateBrowsingEnabled();
-        mNavigationBar.setIncognitoMode(incognito);
+        mNavigationBar.setIncognitoMode(tab.isPrivateBrowsingEnabled());
         updateAutoLogin(tab, false);
         if (web != null && web.getVisibleTitleHeight()
                 != mTitleBar.getEmbeddedHeight()
-- 
cgit v1.1