commit 0f1f66a79bf676959d4e0fcfda70c08121ae0c57
author Daniel Lehmann <lehmannd@google.com> Wed Mar 16 15:46:36 2011 -0700
committer Daniel Lehmann <lehmannd@google.com> Wed Mar 16 15:46:36 2011 -0700
tree 08ba97798b9c3639aae70dabcab754d5cd038a05
parent 0bb65a8168c24f7ba21b385bf5341c42b52f49a6

Fix crash on launching the menu on the phone

Change-Id: I5f390fd545d9e9d2f30aca2c9933bdc6ef042041

src/com/android/contacts/activities/ContactBrowserActivity.java

diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index e888bc0..fe42385 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -686,7 +686,9 @@
         }
 
         MenuItem settings = menu.findItem(R.id.menu_settings);
-        settings.setVisible(!ContactsPreferenceActivity.isEmpty(this));
+        if (settings != null) {
+            settings.setVisible(!ContactsPreferenceActivity.isEmpty(this));
+        }
 
         mOptionsMenuCustomFilterChangeable = isCustomFilterChangeable();