diff options
| author | Adam Powell <adamp@google.com> | 2013-05-03 11:03:10 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2013-05-03 11:03:10 -0700 |
| commit | dcc55855bc660fc2f45d02a1398be2e4fcf5fcb5 (patch) | |
| tree | 758c151390ab34f534c0f12093b9e749186965bd /core/java | |
| parent | 48f2b548edf8e276cc89d2c4c2d2936cde46fc95 (diff) | |
| download | frameworks_base-dcc55855bc660fc2f45d02a1398be2e4fcf5fcb5.zip frameworks_base-dcc55855bc660fc2f45d02a1398be2e4fcf5fcb5.tar.gz frameworks_base-dcc55855bc660fc2f45d02a1398be2e4fcf5fcb5.tar.bz2 | |
Fix a NPE in MenuItemImpl when setting null ActionProvider
Change-Id: I00be010b2197d0f41d0e45b3814474d3ad0c3295
Diffstat (limited to 'core/java')
| -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; } |