commit 1a576923d9eaa74f68076227949fdcfade5baa9c
author Yorke Lee <yorkelee@google.com> Fri Apr 25 22:10:30 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 25 22:10:30 2014 +0000
tree b84fff68ffa1433ca5d6d7568360fae4da25210c
parent 08afec7f1251b6a337eda32762afd023fbe2ec95
parent 342de108624e4c3c796050624572d2f1f815dcd3

Merge "Check whether the contact exists when saving the contact"

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

diff --git a/src/com/android/contacts/activities/AttachPhotoActivity.java b/src/com/android/contacts/activities/AttachPhotoActivity.java
index 2d9e9f5..bf79bfa 100644
--- a/src/com/android/contacts/activities/AttachPhotoActivity.java
+++ b/src/com/android/contacts/activities/AttachPhotoActivity.java
@@ -206,6 +206,12 @@
      */
     private void saveContact(Contact contact) {
 
+        if (contact.getRawContacts() == null) {
+            Log.w(TAG, "No raw contacts found for contact");
+            finish();
+            return;
+        }
+
         // Obtain the raw-contact that we will save to.
         RawContactDeltaList deltaList = contact.createRawContactDeltaList();
         RawContactDelta raw = deltaList.getFirstWritableRawContact(this);