Clean up usage of last used and times used

Bug:124239240
Test: Manual and updated unit tests
Change-Id: I716ec4fc8dff35be4b42a5d6bddfd5506842c4bf

2 files changed, 1 insertions, 22 deletions

diff --git a/tests/src/com/android/contacts/model/ContactLoaderTest.java b/tests/src/com/android/contacts/model/ContactLoaderTest.java
index 91873e9df..8aa078b1e 100644
--- a/tests/src/com/android/contacts/model/ContactLoaderTest.java
+++ b/tests/src/com/android/contacts/model/ContactLoaderTest.java
@@ -28,7 +28,6 @@ import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.StatusUpdates;
 import android.test.LoaderTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
-
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.account.AccountWithDataSet;
@@ -38,14 +37,11 @@ import com.android.contacts.test.mocks.MockAccountTypeManager;
 import com.android.contacts.test.mocks.MockContentProvider;
 import com.android.contacts.testing.InjectedServices;
 import com.android.contacts.util.Constants;
-
 import com.google.common.collect.Lists;
-
+import java.util.List;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.List;
-
 /**
  * Runs ContactLoader tests for the the contact-detail and editor view.
  */
@@ -346,9 +342,6 @@ public class ContactLoaderTest extends LoaderTestCase {
                     Contacts.SEND_TO_VOICEMAIL,
                     Contacts.CUSTOM_RINGTONE,
                     Contacts.IS_USER_PROFILE,
-
-                    Data.TIMES_USED,
-                    Data.LAST_TIME_USED
             };
 
             List<String> projectionList = Lists.newArrayList(COLUMNS_INTERNAL);
@@ -393,9 +386,6 @@ public class ContactLoaderTest extends LoaderTestCase {
                     0,
                     null,
                     0,
-
-                    0,
-                    0
             };
 
             List<Object> rowsList = Lists.newArrayList(ROWS_INTERNAL);
diff --git a/tests/src/com/android/contacts/model/dataitem/DataItemTests.java b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
index 7b60bebca..4b76d0c5d 100644
--- a/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
+++ b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
@@ -29,15 +29,12 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.ContactsContract.CommonDataKinds.Website;
 import android.provider.ContactsContract.Contacts.Data;
-import android.provider.ContactsContract.Contacts.Entity;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
-
 import com.android.contacts.Collapser;
 import com.android.contacts.model.account.AccountType.EditType;
 import com.android.contacts.model.account.BaseAccountType;
 import com.android.contacts.model.account.GoogleAccountType;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -83,12 +80,6 @@ public class DataItemTests extends AndroidTestCase {
         mValues1.put(Data.IS_SUPER_PRIMARY, 1);
         mValues2.put(Data.IS_PRIMARY, 0);
 
-        mValues1.put(Entity.TIMES_USED, 5);
-        mValues2.put(Entity.TIMES_USED, 4);
-
-        mValues1.put(Entity.LAST_TIME_USED, 555);
-        mValues2.put(Entity.LAST_TIME_USED, 999);
-
         final DataKind kind = new DataKind("test.mimetype", 0, 0, false);
         kind.actionBody = new BaseAccountType.SimpleInflater(0);
         kind.typeList = new ArrayList<>();
@@ -104,8 +95,6 @@ public class DataItemTests extends AndroidTestCase {
         assertEquals(1, dataList.size());
         assertEquals(true, dataList.get(0).isSuperPrimary());
         assertEquals(true, dataList.get(0).isPrimary());
-        assertEquals(9, (int) dataList.get(0).getTimesUsed());
-        assertEquals(999L, (long) dataList.get(0).getLastTimeUsed());
         assertEquals(1, dataList.get(0).getKindTypeColumn(kind));
     }