release-request-01b39c26-bf86-40a5-a7bf-8eb15c488673-for-git_oc-mr1-release-4080221 snap-temp-L23400000072087081

Change-Id: I8b24c004739a9805f7cb93ca19a05b9147b6bb9e

3 files changed, 6 insertions, 5 deletions

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 00000000..dc2d0b32
--- /dev/null
+++ b/OWNERS
@@ -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);