diff options
| author | Adam Powell <adamp@google.com> | 2013-05-03 18:58:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-03 18:58:35 +0000 |
| commit | 2b662e8ef96c645e38a3debc29afa7454664f6cb (patch) | |
| tree | 2a328c9f096c89b94dcf63439cca6d4b13cc954f | |
| parent | 5d3e89beb090cdfa1e305025a4e10f0591b2fa66 (diff) | |
| parent | dcc55855bc660fc2f45d02a1398be2e4fcf5fcb5 (diff) | |
| download | frameworks_base-2b662e8ef96c645e38a3debc29afa7454664f6cb.zip frameworks_base-2b662e8ef96c645e38a3debc29afa7454664f6cb.tar.gz frameworks_base-2b662e8ef96c645e38a3debc29afa7454664f6cb.tar.bz2 | |
Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
| -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; } |