drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2011-01-17 13:26:50 -08:00
committed by Android (Google) Code Review
parent fed7022952 4192e38827
commit a1487347f5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/view/menu/MenuBuilder.java
View File

@ -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;