diff options
| author | Adam Powell <adamp@google.com> | 2011-01-17 13:29:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-17 13:29:03 -0800 |
| commit | dc494e1e48b499ee1e56210fc82d3c489a6f5922 (patch) | |
| tree | eda2e5bebf19a1a2ce8ce2472328505e371e97cb | |
| parent | 0e8280cc6e5d553066d5f09892c12c2a8a846791 (diff) | |
| parent | a1487347f5ba24648303bf8c9e455ca2ef0de7ea (diff) | |
am a1487347: Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb
* commit 'a1487347f5ba24648303bf8c9e455ca2ef0de7ea':
Fix bug 3362446 - NPE in legacy menus
| -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; |