From 4192e38827b27416410516d4bb0d545c36f4660e Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 17 Jan 2011 13:16:54 -0800
Subject: Fix bug 3362446 - NPE in legacy menus

Change-Id: Icf9a0bec46c74ace3acbc85eea45d1d769b699d1
---
 core/java/com/android/internal/view/menu/MenuBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java
index 588b10c2d066..ff59950017c9 100644
--- a/core/java/com/android/internal/view/menu/MenuBuilder.java
+++ b/core/java/com/android/internal/view/menu/MenuBuilder.java
@@ -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;
-- 
cgit v1.2.3-59-g8ed1b