commit a4221712e5ca7ed1ac82e9389c862bacd37f47f3
author Dave Santoro <dsantoro@google.com> Fri Sep 02 16:36:39 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 02 16:36:39 2011 -0700
tree 4e3f9a19c5964614d7daf503a2dcb21783727d56
parent edd5e2c79c89d8f1d545c886f1915b4d94264551
parent 454e272a976671d357a6d3945eca5ccf9483ccef

Merge "    Fix data update/delete URIs for profiles."

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 a045eb4..8244e9c 100644
--- a/src/com/android/contacts/model/EntityDelta.java
+++ b/src/com/android/contacts/model/EntityDelta.java
@@ -414,7 +414,14 @@
                 // Ignore children if parent was deleted
                 if (isContactDelete) continue;
 
-                builder = child.buildDiff(Data.CONTENT_URI);
+                // Use the profile data URI if the contact is the profile.
+                if (mContactsQueryUri.equals(Profile.CONTENT_RAW_CONTACTS_URI)) {
+                    builder = child.buildDiff(Uri.withAppendedPath(Profile.CONTENT_URI,
+                            RawContacts.Data.CONTENT_DIRECTORY));
+                } else {
+                    builder = child.buildDiff(Data.CONTENT_URI);
+                }
+
                 if (child.isInsert()) {
                     if (isContactInsert) {
                         // Parent is brand new insert, so back-reference _id