diff options
| author | 2011-01-17 13:26:50 -0800 | |
|---|---|---|
| committer | 2011-01-17 13:26:50 -0800 | |
| commit | a1487347f5ba24648303bf8c9e455ca2ef0de7ea (patch) | |
| tree | 1299cde954a44d6d8eacda1ef96a614d4f8ca7c2 | |
| parent | fed702295210cfab30e1be0166eac0523a332540 (diff) | |
| parent | 4192e38827b27416410516d4bb0d545c36f4660e (diff) | |
Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb
| -rw-r--r-- | core/java/com/android/internal/view/menu/MenuBuilder.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |