commit 60e304cf254d9722df1a877269b5d0bf40a801d1
author Jay Shrauner <shrauner@google.com> Wed Aug 21 10:43:37 2013 -0700
committer Jay Shrauner <shrauner@google.com> Wed Aug 21 10:43:37 2013 -0700
tree c5137a260007c33da8b925236758507bd516a32b
parent 8c42b52d926475073e188d06c39c432945db781f

NPE fix

Protect menu visibility sets with null checks.

Bug:8489379
Change-Id: I58507525f1a665fe04acb6c59f1d5b11adc8fa87

src/com/android/contacts/detail/ContactLoaderFragment.java

diff --git a/src/com/android/contacts/detail/ContactLoaderFragment.java b/src/com/android/contacts/detail/ContactLoaderFragment.java
index 4ceebc6..0d4285f 100644
--- a/src/com/android/contacts/detail/ContactLoaderFragment.java
+++ b/src/com/android/contacts/detail/ContactLoaderFragment.java
@@ -259,16 +259,24 @@
         }
 
         final MenuItem editMenu = menu.findItem(R.id.menu_edit);
-        editMenu.setVisible(mOptionsMenuEditable);
+        if (editMenu != null) {
+            editMenu.setVisible(mOptionsMenuEditable);
+        }
 
         final MenuItem deleteMenu = menu.findItem(R.id.menu_delete);
-        deleteMenu.setVisible(mOptionsMenuEditable);
+        if (deleteMenu != null) {
+            deleteMenu.setVisible(mOptionsMenuEditable);
+        }
 
         final MenuItem shareMenu = menu.findItem(R.id.menu_share);
-        shareMenu.setVisible(mOptionsMenuShareable);
+        if (shareMenu != null) {
+            shareMenu.setVisible(mOptionsMenuShareable);
+        }
 
         final MenuItem createContactShortcutMenu = menu.findItem(R.id.menu_create_contact_shortcut);
-        createContactShortcutMenu.setVisible(mOptionsMenuCanCreateShortcut);
+        if (createContactShortcutMenu != null) {
+            createContactShortcutMenu.setVisible(mOptionsMenuCanCreateShortcut);
+        }
     }
 
     public boolean isContactOptionsChangeEnabled() {