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

Commit 976190d2 authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null"

parents 7e2fb173 08f194bc

core/java/com/android/internal/app/ActionBarImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -110,13 +110,13 @@ public class ActionBarImpl extends ActionBar { 
                com.android.internal.R.id.lower_action_context_bar);

        mAnimatorView = (ViewAnimator) decor.findViewById(

                com.android.internal.R.id.action_bar_animator);

        mActionView.setContextView(mUpperContextView);



        if (mActionView == null || mUpperContextView == null || mAnimatorView == null) {

            throw new IllegalStateException(getClass().getSimpleName() + " can only be used " +

                    "with a compatible window decor layout");

        }



        mActionView.setContextView(mUpperContextView);

        mContextDisplayMode = mLowerContextView == null ?

                CONTEXT_DISPLAY_NORMAL : CONTEXT_DISPLAY_SPLIT;

    }