commit 306f903ffb9aa39bb3833fa052f24a37dfed2a4f
author Android (Google) Code Review <android-gerrit@google.com> Thu Oct 29 19:59:17 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 29 19:59:17 2009 -0400
tree c2a3f1d132e4df3475e917e2ebf2525be2926de4
parent 5bd82f693788c39c2b2225ac49b38cb8be5d1d18
parent e82043c7a2e319ce24215606fee8e50cccd1b167

Merge change I994fc479 into eclair

* changes:
  Send RESULT_CANCELED when missing, return legacy Uris.

src/com/android/contacts/model/EntityDelta.java

diff --git a/src/com/android/contacts/model/EntityDelta.java b/src/com/android/contacts/model/EntityDelta.java
index d4e9632..ae30806 100644
--- a/src/com/android/contacts/model/EntityDelta.java
+++ b/src/com/android/contacts/model/EntityDelta.java
@@ -32,6 +32,7 @@
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
 import android.util.Log;
 import android.view.View;
 
@@ -695,7 +696,11 @@
             if (mAfter != null) {
                 values.putAll(mAfter);
             }
-            values.remove(ContactsContract.CommonDataKinds.GroupMembership.GROUP_SOURCE_ID);
+            if (values.containsKey(GroupMembership.GROUP_ROW_ID)) {
+                // Clear to avoid double-definitions, and prefer rows
+                values.remove(GroupMembership.GROUP_SOURCE_ID);
+            }
+
             return values;
         }