mozilla-central: changeset 114428:7b516748a65c26b1999e20ea37276694c266181b

☠☠ backed out by 9eb8b4bd265d ☠ ☠
author	Sriram Ramasubramanian <sriram@mozilla.com>
	Wed, 28 Nov 2012 16:38:32 -0800
changeset 114428	7b516748a65c26b1999e20ea37276694c266181b
parent 114427	91dfecde7a96c0d9e40fdd79701d4dc4917f6010
child 114429	7fe5182d67862f691375879eb9dabf8b7e7e7f9d
push id	23917
push user	emorley@mozilla.com
push date	Thu, 29 Nov 2012 14:20:29 +0000
treeherder	mozilla-central@c72d38e7a212 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bnicholson
bugs	816314
milestone	20.0a1
first release with	nightly linux32 c72d38e7a212 / 20.0a1 / 20121129074803 / files nightly linux64 c72d38e7a212 / 20.0a1 / 20121129074803 / files nightly mac c72d38e7a212 / 20.0a1 / 20121129074803 / files nightly win32 c72d38e7a212 / 20.0a1 / 20121129074803 / files nightly win64 c72d38e7a212 / 20.0a1 / 20121129074803 / files
last release without	nightly linux32 3c3a8eed0578 / 20.0a1 / 20121128030742 / files nightly linux64 3c3a8eed0578 / 20.0a1 / 20121128030742 / files nightly mac 3c3a8eed0578 / 20.0a1 / 20121128030742 / files nightly win32 3c3a8eed0578 / 20.0a1 / 20121128030742 / files nightly win64 3c3a8eed0578 / 20.0a1 / 20121128030742 / files

--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -121,17 +121,19 @@ public class AwesomeBar extends GeckoAct
         String currentUrl = intent.getStringExtra(CURRENT_URL_KEY);
         if (currentUrl != null) {
             mText.setText(currentUrl);
             mText.selectAll();
         }
 
         mTarget = intent.getStringExtra(TARGET_KEY);
         if (mTarget.equals(Target.CURRENT_TAB.name())) {
-            if (Tabs.getInstance().getSelectedTab().isPrivate()) {
+            // Bug 816332 needs to be fixed to avoid AwesomeBar opening before tabs exist.
+            Tab tab = Tabs.getInstance().getSelectedTab();
+            if (tab != null && tab.isPrivate()) {
                 BrowserToolbarBackground mAddressBarBg = (BrowserToolbarBackground) findViewById(R.id.address_bar_bg);
                 mAddressBarBg.setPrivateMode(true);
 
                 TabsButton mTabs = (TabsButton) findViewById(R.id.dummy_tab);
                 if (mTabs != null)
                     mTabs.setPrivateMode(true);
 
                 mText.setPrivateMode(true);