commit 1c06ce7ba10cb95183a704d5835e8005c023f726
author Jay Shrauner <shrauner@google.com> Fri May 01 11:56:08 2015 -0700
committer Jay Shrauner <shrauner@google.com> Fri May 01 12:02:01 2015 -0700
tree 08210dad8bdfd80919210f682f918b08dcd9145b
parent ac48ce4de74370237e8d6e862cf5e3b26aa8f763

Fix NPEs when contact is null

Fix NPEs in createLauncherShortcutWithContact and deleteContact.

Bug:20757451
Change-Id: Ib55789f2a54d5cab9fe269aa4d4f8c6858ed8806

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 154968d..4e824ea 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2317,7 +2317,8 @@
     }
 
     private boolean isShortcutCreatable() {
-        if (mContactData == null || mContactData.isUserProfile()) {
+        if (mContactData == null || mContactData.isUserProfile() ||
+                mContactData.isDirectoryEntry()) {
             return false;
         }
         final Intent createShortcutIntent = new Intent();
@@ -2440,7 +2441,9 @@
                 }
                 return true;
             case R.id.menu_delete:
-                deleteContact();
+                if (isContactEditable()) {
+                    deleteContact();
+                }
                 return true;
             case R.id.menu_share:
                 if (isContactShareable()) {
@@ -2448,7 +2451,9 @@
                 }
                 return true;
             case R.id.menu_create_contact_shortcut:
-                createLauncherShortcutWithContact();
+                if (isShortcutCreatable()) {
+                    createLauncherShortcutWithContact();
+                }
                 return true;
             case R.id.menu_help:
                 HelpUtils.launchHelpAndFeedbackForContactScreen(this);