Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a1487347f5ba24648303bf8c9e455ca2ef0de7ea':
  Fix bug 3362446 - NPE in legacy menus
This commit is contained in:
Adam Powell
2011-01-17 13:29:03 -08:00
committed by Android Git Automerger
parent 0e8280cc6e a1487347f5
commit dc494e1e48
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() { private ViewGroup getMeasureActionButtonParent() {
if (mMeasureActionButtonParent == null) { 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); .inflate(LAYOUT_RES_FOR_TYPE[TYPE_ACTION_BUTTON], null, false);
} }
return mMeasureActionButtonParent; return mMeasureActionButtonParent;