commit 38ce75cc0aa40ffaf6c35b83c4d3d166e024a1ca
author Dmitri Plotnikov <dplotnikov@google.com> Mon Mar 15 16:37:52 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 15 16:37:52 2010 -0700
tree 0dabcafae299098f738f9d4b831ed604eb686776
parent bb54a9ecb2ac7803849f1246761671498dcee3b3
parent 76514bc1f35c031736ccaf1ff59edae49030181c

Merge "Fixed NPE in adding a phone number to an existing contact from call log"

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index e7b5e29..2dfab29 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -411,7 +411,7 @@
     private QueryHandler mQueryHandler;
     private boolean mJustCreated;
     private boolean mSyncEnabled;
-    private Uri mSelectedContactUri;
+    Uri mSelectedContactUri;
 
 //    private boolean mDisplayAll;
     private boolean mDisplayOnlyPhones;
@@ -480,7 +480,9 @@
 
     private class DeleteClickListener implements DialogInterface.OnClickListener {
         public void onClick(DialogInterface dialog, int which) {
-            getContentResolver().delete(mSelectedContactUri, null, null);
+            if (mSelectedContactUri != null) {
+                getContentResolver().delete(mSelectedContactUri, null, null);
+            }
         }
     }