diff options
author | Michael Kolb <kolby@google.com> | 2012-05-14 08:31:04 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2012-05-14 08:31:04 -0700 |
commit | 2b552f5154fb582ddfd3296eaa8ec35675edb613 (patch) | |
tree | feaca01f95c9f2abfa2fc65921e9375c8e50f076 /src/com/android/browser/BrowserActivity.java | |
parent | 5bc61e23008567a9d934848359439d8936aa3482 (diff) | |
download | packages_apps_Browser-2b552f5154fb582ddfd3296eaa8ec35675edb613.zip packages_apps_Browser-2b552f5154fb582ddfd3296eaa8ec35675edb613.tar.gz packages_apps_Browser-2b552f5154fb582ddfd3296eaa8ec35675edb613.tar.bz2 |
Monkey proofing
Bug: 6482880
Change-Id: I0fe14b6828098071ebd6dc4782cf092dc018ee3e
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
-rw-r--r-- | src/com/android/browser/BrowserActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class BrowserActivity extends Activity { @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - return mController.onCreateOptionsMenu(menu); + return (mController != null) && mController.onCreateOptionsMenu(menu); } @Override |