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

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

Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb

parents fed70229 4192e388

core/java/com/android/internal/view/menu/MenuBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,7 @@ public class MenuBuilder implements Menu { 
     */

    private ViewGroup getMeasureActionButtonParent() {

        if (mMeasureActionButtonParent == null) {

            mMeasureActionButtonParent = (ViewGroup) mMenuTypes[TYPE_ACTION_BUTTON].getInflater()

            mMeasureActionButtonParent = (ViewGroup) getMenuType(TYPE_ACTION_BUTTON).getInflater()

                    .inflate(LAYOUT_RES_FOR_TYPE[TYPE_ACTION_BUTTON], null, false);

        }

        return mMeasureActionButtonParent;