auto import from //branches/cupcake/...@137873
diff --git a/src/com/android/contacts/EditContactActivity.java b/src/com/android/contacts/EditContactActivity.java
index 1e6ae51..b89573b 100644
--- a/src/com/android/contacts/EditContactActivity.java
+++ b/src/com/android/contacts/EditContactActivity.java
@@ -921,7 +921,10 @@
if (!empty) {
values.put(entry.column, data);
mResolver.update(entry.uri, values, null, null);
- numValues++;
+ if (!People.CUSTOM_RINGTONE.equals(entry.column) &&
+ !People.SEND_TO_VOICEMAIL.equals(entry.column)) {
+ numValues++;
+ }
} else {
values.put(entry.column, (String) null);
mResolver.update(entry.uri, values, null, null);
@@ -935,7 +938,10 @@
} else {
mResolver.insert(entry.uri, values);
}
- numValues++;
+ if (!People.CUSTOM_RINGTONE.equals(entry.column) &&
+ !People.SEND_TO_VOICEMAIL.equals(entry.column)) {
+ numValues++;
+ }
} else if (entry.id != 0) {
mResolver.delete(entry.uri, null, null);
}
@@ -1046,7 +1052,10 @@
entry.uri = mResolver.insert(
Uri.withAppendedPath(contactUri, entry.contentDirectory), values);
entry.id = ContentUris.parseId(entry.uri);
- numValues++;
+ if (!People.CUSTOM_RINGTONE.equals(entry.column) &&
+ !People.SEND_TO_VOICEMAIL.equals(entry.column)) {
+ numValues++;
+ }
}
} else {
// Update the contact with any straggling data, like notes
@@ -1055,7 +1064,10 @@
if (data != null && TextUtils.isGraphic(data)) {
values.put(entry.column, data);
mResolver.update(contactUri, values, null, null);
- numValues++;
+ if (!People.CUSTOM_RINGTONE.equals(entry.column) &&
+ !People.SEND_TO_VOICEMAIL.equals(entry.column)) {
+ numValues++;
+ }
}
}
}