Merge "Fix bug 4487948 - action bar tabs + configuration change = :("

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java
index c18565df9cdd..f1618e1895b2 100644
--- a/core/java/com/android/internal/widget/ActionBarContainer.java
+++ b/core/java/com/android/internal/widget/ActionBarContainer.java
@@ -78,7 +78,9 @@ public class ActionBarContainer extends FrameLayout {
             removeView(mTabContainer);
         }
         mTabContainer = tabView;
-        addView(tabView);
+        if (tabView != null) {
+            addView(tabView);
+        }
     }
 
     public View getTabContainer() {