commit 049dd3d4a4869e0c65d370e2538fcfb55bacef52
author Adam Powell <adamp@google.com> Thu Dec 02 13:43:59 2010 -0800
committer Adam Powell <adamp@google.com> Thu Dec 02 13:45:30 2010 -0800
tree 028dcf7f1b53ab60e6d1ba99e528b69267d7262f
parent 5e3af5fcba360916f38753bd505e47040fc87729

Fix bug 3248786 - silly monkeys.

Change-Id: I41306cae06a7b4fd3852e0760ae668c8d6eacc5d

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 0a2e031..a0a6b42 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2363,7 +2363,11 @@
      */
     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;
     }