Permalink
Browse files

am a148734: Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb

* commit 'a1487347f5ba24648303bf8c9e455ca2ef0de7ea':
  Fix bug 3362446 - NPE in legacy menus
  • Loading branch information...
2 parents 0e8280c + a148734 commit dc494e1e48b499ee1e56210fc82d3c489a6f5922 Adam Powell committed with Android Git Automerger Jan 17, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/java/com/android/internal/view/menu/MenuBuilder.java
@@ -1050,7 +1050,7 @@ void onItemActionRequestChanged(MenuItemImpl item) {
*/
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;

0 comments on commit dc494e1

Please sign in to comment.