Merge "Fix bug 3248786 - silly monkeys."

2 files changed, 6 insertions, 2 deletions

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 0a2e031dd74b..a0a6b42b3d77 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2363,7 +2363,11 @@ public class Activity extends ContextThemeWrapper
      */
     public boolean onMenuOpened(int featureId, Menu menu) {
         if (featureId == Window.FEATURE_ACTION_BAR) {
-            mActionBar.dispatchMenuVisibilityChanged(true);
+            if (mActionBar != null) {
+                mActionBar.dispatchMenuVisibilityChanged(true);
+            } else {
+                Log.e(TAG, "Tried to open action bar menu with no action bar");
+            }
         }
         return true;
     }
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 138dff76235c..b487d92a47e0 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -867,7 +867,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
         if (panel.isOpen) {
             // The window manager will give us a valid window token
             new MenuDialogHelper(subMenu).show(null);
-        } else {
+        } else if (hasFeature(FEATURE_ACTION_BAR)) {
             mActionButtonPopup = new ActionButtonSubmenu(getContext(), subMenu);
             mActionButtonPopup.show();
             Callback cb = getCallback();