diff options
| author | Adam Powell <adamp@google.com> | 2013-05-06 08:44:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-06 08:44:33 -0700 |
| commit | f581b533cf0ff774405bae057f5883fe9768c6a8 (patch) | |
| tree | b2b9122584f2063de59c5dd81e3e63911b73138c /core/java/com/android | |
| parent | 91091ea6923b2439e3a309b08548b4b23339a725 (diff) | |
| parent | 2b662e8ef96c645e38a3debc29afa7454664f6cb (diff) | |
| download | frameworks_base-f581b533cf0ff774405bae057f5883fe9768c6a8.zip frameworks_base-f581b533cf0ff774405bae057f5883fe9768c6a8.tar.gz frameworks_base-f581b533cf0ff774405bae057f5883fe9768c6a8.tar.bz2 | |
am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
* commit '2b662e8ef96c645e38a3debc29afa7454664f6cb':
Fix a NPE in MenuItemImpl when setting null ActionProvider
Diffstat (limited to 'core/java/com/android')
| -rw-r--r-- | core/java/com/android/internal/view/menu/MenuItemImpl.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java index 7189610..39078ca 100644 --- a/core/java/com/android/internal/view/menu/MenuItemImpl.java +++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java @@ -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; } |