commit 9837d6d02fc0968614efe5260a176e0c406fe93c
author Adam Powell <adamp@google.com> Wed Jul 13 20:42:19 2011 -0700
committer Adam Powell <adamp@google.com> Wed Jul 13 20:42:19 2011 -0700
tree 1681118bbf2513b421dc076f8d3917dac2bca985
parent 648b36bc3011437aeb1991dd355c83be7e5f0db5

Fix bug in submenus opened from icon menus

Change-Id: I8b60ceefbccb5cad78d1b5c55702a2685a5f5382

core/java/com/android/internal/view/menu/IconMenuPresenter.java

diff --git a/core/java/com/android/internal/view/menu/IconMenuPresenter.java b/core/java/com/android/internal/view/menu/IconMenuPresenter.java
index 56128d4..d1b1dae 100644
--- a/core/java/com/android/internal/view/menu/IconMenuPresenter.java
+++ b/core/java/com/android/internal/view/menu/IconMenuPresenter.java
@@ -179,8 +179,10 @@
         @Override
         public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
             mOpenSubMenuId = 0;
-            mOpenSubMenu.dismiss();
-            mOpenSubMenu = null;
+            if (mOpenSubMenu != null) {
+                mOpenSubMenu.dismiss();
+                mOpenSubMenu = null;
+            }
         }
 
         @Override