Check for null MenuHelper before setting presenter callback
Bug: 26219569
Change-Id: Ia19a1304aa10dac52b89d0ee85acdb5671a15777
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index 6a1e07b..40eaaf7 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -702,11 +702,13 @@
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;