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

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

Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev

parents 5d3e89be dcc55855

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

+7 −5
Original line number Original line Diff line number Diff line
@@ -598,11 +598,13 @@ public final class MenuItemImpl implements MenuItem { 
        mActionView = null;

        mActionView = null;

        mActionProvider = actionProvider;

        mActionProvider = actionProvider;

        mMenu.onItemsChanged(true); // Measurement can be changed

        mMenu.onItemsChanged(true); // Measurement can be changed

        if (mActionProvider != null) {

            mActionProvider.setVisibilityListener(new ActionProvider.VisibilityListener() {

            mActionProvider.setVisibilityListener(new ActionProvider.VisibilityListener() {

                @Override public void onActionProviderVisibilityChanged(boolean isVisible) {

                @Override public void onActionProviderVisibilityChanged(boolean isVisible) {

                    mMenu.onItemVisibleChanged(MenuItemImpl.this);

                    mMenu.onItemVisibleChanged(MenuItemImpl.this);

                }

                }

            });

            });

        }

        return this;

        return this;

    }

    }