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

Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev

Browse Source
This commit is contained in:
Adam Powell
2013-05-03 18:58:35 +00:00
committed by Android (Google) Code Review
parent 5d3e89beb0 dcc55855bc
commit 2b662e8ef9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/view/menu/MenuItemImpl.java
View File

@@ -598,11 +598,13 @@ public final class MenuItemImpl implements MenuItem {
mActionView = null;
mActionProvider = actionProvider;
mMenu.onItemsChanged(true); // Measurement can be changed
mActionProvider.setVisibilityListener(new ActionProvider.VisibilityListener() {
@Override public void onActionProviderVisibilityChanged(boolean isVisible) {
mMenu.onItemVisibleChanged(MenuItemImpl.this);
}
});
if (mActionProvider != null) {
mActionProvider.setVisibilityListener(new ActionProvider.VisibilityListener() {
@Override public void onActionProviderVisibilityChanged(boolean isVisible) {
mMenu.onItemVisibleChanged(MenuItemImpl.this);
}
});
}
return this;
}