From 53023ffdeae781e9750a5ef90a31ee3f5e0c2b4c Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Fri, 18 Sep 2015 13:20:20 -0400
Subject: [PATCH] SubMenuBuilder.getRootMenu() should return root menu, not
 parent

Also fixes incorrect call from MenuItemImpl to dispatchMenuSelected,
which should according to the documentation be passing the direct
parent menu of the menu item.

Bug: 23725571
Change-Id: I2d1f04b80ce05d141ba2dfd77f62bb13b2268625
---
 core/java/com/android/internal/view/menu/MenuItemImpl.java   | 2 +-
 core/java/com/android/internal/view/menu/SubMenuBuilder.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java
index 08d4e8616795a..624c9e24e9451 100644
--- a/core/java/com/android/internal/view/menu/MenuItemImpl.java
+++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java
@@ -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;
         }
 
diff --git a/core/java/com/android/internal/view/menu/SubMenuBuilder.java b/core/java/com/android/internal/view/menu/SubMenuBuilder.java
index 92acf8cda8f5c..cf741bf5bb020 100644
--- a/core/java/com/android/internal/view/menu/SubMenuBuilder.java
+++ b/core/java/com/android/internal/view/menu/SubMenuBuilder.java
@@ -73,7 +73,7 @@ public class SubMenuBuilder extends MenuBuilder implements SubMenu {
 
     @Override
     public MenuBuilder getRootMenu() {
-        return mParentMenu;
+        return mParentMenu.getRootMenu();
     }
 
     @Override