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

Commit 31cb4bb4 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "SubMenuBuilder.getRootMenu() should return root menu, not parent"

parents 87b21722 53023ffd

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

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public final class MenuItemImpl implements MenuItem { 
            return true;

        }



        if (mMenu.dispatchMenuItemSelected(mMenu.getRootMenu(), this)) {

        if (mMenu.dispatchMenuItemSelected(mMenu, this)) {

            return true;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class SubMenuBuilder extends MenuBuilder implements SubMenu { 


    @Override

    public MenuBuilder getRootMenu() {

        return mParentMenu;

        return mParentMenu.getRootMenu();

    }



    @Override