diff options
| author | Makoto Onuki <omakoto@google.com> | 2017-06-06 16:46:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 16:46:33 +0000 |
| commit | e184df949604bb6da797bbfd3b9c602e737e10e3 (patch) | |
| tree | 87cd70f25954c94f670a125254a229d7a40dcdb7 | |
| parent | b3d8ed884fe44a0ffa46016f56331e2a57dee670 (diff) | |
| parent | dc72d6de7a9a545d18fb4f46f5a726c6fa00abef (diff) | |
| download | ContactsProvider-e184df949604bb6da797bbfd3b9c602e737e10e3.tar.gz | |
Allow updating TIMES_CONTACTED again. am: f752e4fbe3
am: dc72d6de7a
Change-Id: I3a93c42b324f287090bc247f0210e06a87fa2fda
| -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); |