diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-08 07:35:50 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-08 07:35:50 +0000 |
commit | 88ff1f1e3e3347edd50825d4339908caeb21cd35 (patch) | |
tree | c2bf987f59f326e0f0f8f4742abf2f03a6583f96 | |
parent | 7557d7f48e470e53ab8109b9eef0e90aa797729d (diff) | |
parent | 9c20d3d0bb1eb9f8ae4f5daf2048d02f0ddb7966 (diff) | |
download | ContactsProvider-88ff1f1e3e3347edd50825d4339908caeb21cd35.tar.gz |
release-request-01b39c26-bf86-40a5-a7bf-8eb15c488673-for-git_oc-mr1-release-4080221 snap-temp-L23400000072087081
Change-Id: I8b24c004739a9805f7cb93ca19a05b9147b6bb9e
-rw-r--r-- | OWNERS | 2 | ||||
-rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 7 | ||||
-rw-r--r-- | tests/src/com/android/providers/contacts/ContactsProvider2Test.java | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -0,0 +1,2 @@ +omakoto@google.com +yamasani@google.com diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 69b87cf2..7d626aee 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -4529,10 +4529,9 @@ public class ContactsProvider2 extends AbstractContactsProvider ContactsDatabaseHelper.copyLongValue( ret, Contacts.RAW_LAST_TIME_CONTACTED, ret, Contacts.LR_LAST_TIME_CONTACTED); - if (ret.containsKey(Contacts.LR_TIMES_CONTACTED)) { - Log.w(TAG, "Column '" + Contacts.LR_TIMES_CONTACTED + "' can no longer be modified" - + " directly, ignored. Caller=" + getCallingPackage()); - } + ContactsDatabaseHelper.copyLongValue( + ret, Contacts.RAW_TIMES_CONTACTED, + ret, Contacts.LR_TIMES_CONTACTED); ret.remove(Contacts.LR_LAST_TIME_CONTACTED); ret.remove(Contacts.LR_TIMES_CONTACTED); diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java index e9cf2a18..8930338e 100644 --- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java +++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java @@ -979,7 +979,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test { long rawContactId = ContentUris.parseId(rowUri); values.put(RawContacts.LAST_TIME_CONTACTED, 86400); - values.put(RawContacts.TIMES_CONTACTED, 0); // This is not insertable. + values.put(RawContacts.TIMES_CONTACTED, 10); assertStoredValues(rowUri, values); assertSelection(RawContacts.CONTENT_URI, values, RawContacts._ID, rawContactId); |