From 9084d22cb9fb2367ce56403ab6aecbee26a705bd Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Wed, 16 Dec 2015 09:56:37 -0500 Subject: [PATCH] Check for null MenuHelper before setting presenter callback Bug: 26219569 Change-Id: Ia19a1304aa10dac52b89d0ee85acdb5671a15777 --- core/java/com/android/internal/policy/DecorView.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 6a1e07b71037..40eaaf7bae80 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -702,11 +702,13 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind helper = mWindow.mContextMenu.showDialog(originalView, originalView.getWindowToken()); } - // If it's a dialog, the callback needs to handle showing sub-menus. - // Either way, the callback is required for propagating selection to - // Context.onContextMenuItemSelected(). - callback.setShowDialogForSubmenu(!isPopup); - helper.setPresenterCallback(callback); + if (helper != null) { + // If it's a dialog, the callback needs to handle showing + // sub-menus. Either way, the callback is required for propagating + // selection to Context.onContextMenuItemSelected(). + callback.setShowDialogForSubmenu(!isPopup); + helper.setPresenterCallback(callback); + } mWindow.mContextMenuHelper = helper; return helper != null; -- 2.11.0