commit 2b552f5154fb582ddfd3296eaa8ec35675edb613
author Michael Kolb <kolby@google.com> Mon May 14 08:31:04 2012 -0700
committer Michael Kolb <kolby@google.com> Mon May 14 08:31:04 2012 -0700
tree feaca01f95c9f2abfa2fc65921e9375c8e50f076
parent 5bc61e23008567a9d934848359439d8936aa3482

Monkey proofing

  Bug: 6482880

Change-Id: I0fe14b6828098071ebd6dc4782cf092dc018ee3e

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index cb475b7..4bb8107 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -207,7 +207,7 @@
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        return mController.onCreateOptionsMenu(menu);
+        return (mController != null) && mController.onCreateOptionsMenu(menu);
     }
 
     @Override