Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 146a0103 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException"

parents ff24bf43 e0adac0e

core/java/com/android/internal/widget/ActionBarView.java

+3 −0
Original line number Diff line number Diff line
@@ -302,6 +302,9 @@ public class ActionBarView extends AbsActionBarView { 
    }



    public void setEmbeddedTabView(ScrollingTabContainerView tabs) {

        if (mTabScrollView != null) {

            removeView(mTabScrollView);

        }

        mTabScrollView = tabs;

        mIncludeTabs = tabs != null;

        if (mIncludeTabs && mNavigationMode == ActionBar.NAVIGATION_MODE_TABS) {