diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-07 07:46:14 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-07 07:46:14 +0000 |
| commit | 992ecd6cfe024c16bdd65aa47cc85d4964db6b54 (patch) | |
| tree | 5de4ab9595e840f53826e7908344b92e5435081c | |
| parent | bc9d6e2ce766d9453bf8193f42227889b83c3050 (diff) | |
| parent | f752e4fbe36b30346c33c97a12ed7bb2bcf4256c (diff) | |
| download | ContactsProvider-992ecd6cfe024c16bdd65aa47cc85d4964db6b54.tar.gz | |
release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-release-4075595 snap-temp-L43000000071370789
Change-Id: Iea4a828dc7c0c2c65d737d42410cd5724ba9e128
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 7 | ||||
| -rw-r--r-- | tests/src/com/android/providers/contacts/ContactsProvider2Test.java | 2 |
2 files changed, 4 insertions, 5 deletions
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); |