diff options
| author | Bart Sears <bsears@google.com> | 2011-09-02 16:51:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-02 16:51:59 -0700 |
| commit | 012dcd474cd3980aa206e4b7a31fa67114f56d54 (patch) | |
| tree | e65f81db49968f369e358aa51fd63783cf521e3e /src | |
| parent | 54e1fb3806e27c88226802d48adeb5c1a1963b2e (diff) | |
| parent | 03b6bc6dc3644e9843f2ff05bca543e546fe3a61 (diff) | |
| download | packages_apps_Browser-012dcd474cd3980aa206e4b7a31fa67114f56d54.zip packages_apps_Browser-012dcd474cd3980aa206e4b7a31fa67114f56d54.tar.gz packages_apps_Browser-012dcd474cd3980aa206e4b7a31fa67114f56d54.tar.bz2 | |
Merge "Fix NPE in setActiveTab"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BaseUi.java | 3 |
1 files changed, 1 insertions, 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() |