From a1c10f99c36d55d66f58cf0c4ce9b6e686bfa5c7 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Wed, 26 Dec 2012 12:56:34 -0800
Subject: [PATCH] Bug 824474: Proper cleanup of tabs-tray while hiding.
 [r=mfinkle]

--HG--
extra : rebase_source : 61bf7bde07dc4cfad77acd656a60c88c4d329d8a
---
 mobile/android/base/TabsPanel.java | 3 +++
 mobile/android/base/TabsTray.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/TabsPanel.java b/mobile/android/base/TabsPanel.java
index 630f35b55845..b6179258e941 100644
--- a/mobile/android/base/TabsPanel.java
+++ b/mobile/android/base/TabsPanel.java
@@ -410,6 +410,9 @@ public class TabsPanel extends TabHost
             mVisible = false;
             mPopupMenu.dismiss();
             dispatchLayoutChange(0, 0);
+
+            mPanel.hide();
+            mPanel = null;
         }
     }
 
diff --git a/mobile/android/base/TabsTray.java b/mobile/android/base/TabsTray.java
index 85e730fd30d7..67220c0e019d 100644
--- a/mobile/android/base/TabsTray.java
+++ b/mobile/android/base/TabsTray.java
@@ -222,7 +222,7 @@ public class TabsTray extends ListView
         }
 
         private void removeTab(Tab tab) {
-            if (tab.isPrivate() == mIsPrivate) {
+            if (tab.isPrivate() == mIsPrivate && mTabs != null) {
                 mTabs.remove(tab);
                 notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
             }