Use new URI for deleting usage stats
Bug 5475575
Change-Id: I11894ef80727e2dc22e73330a5afca41c189135b
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 7fc2627..490fc68 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -283,6 +283,7 @@
private static final int CONTACTS_LOOKUP_STREAM_ITEMS = 1023;
private static final int CONTACTS_LOOKUP_ID_STREAM_ITEMS = 1024;
private static final int CONTACTS_FREQUENT = 1025;
+ private static final int CONTACTS_DELETE_USAGE = 1026;
private static final int RAW_CONTACTS = 2002;
private static final int RAW_CONTACTS_ID = 2003;
@@ -354,7 +355,6 @@
private static final int PROFILE_PHOTO = 19011;
private static final int PROFILE_DISPLAY_PHOTO = 19012;
- private static final int DATA_USAGE_FEEDBACK = 20000;
private static final int DATA_USAGE_FEEDBACK_ID = 20001;
private static final int STREAM_ITEMS = 21000;
@@ -1106,6 +1106,7 @@
CONTACTS_STREQUENT_FILTER);
matcher.addURI(ContactsContract.AUTHORITY, "contacts/group/*", CONTACTS_GROUP);
matcher.addURI(ContactsContract.AUTHORITY, "contacts/frequent", CONTACTS_FREQUENT);
+ matcher.addURI(ContactsContract.AUTHORITY, "contacts/delete_usage", CONTACTS_DELETE_USAGE);
matcher.addURI(ContactsContract.AUTHORITY, "raw_contacts", RAW_CONTACTS);
matcher.addURI(ContactsContract.AUTHORITY, "raw_contacts/#", RAW_CONTACTS_ID);
@@ -1134,7 +1135,6 @@
matcher.addURI(ContactsContract.AUTHORITY, "data/emails/filter/*", EMAILS_FILTER);
matcher.addURI(ContactsContract.AUTHORITY, "data/postals", POSTALS);
matcher.addURI(ContactsContract.AUTHORITY, "data/postals/#", POSTALS_ID);
- matcher.addURI(ContactsContract.AUTHORITY, "data/usagefeedback", DATA_USAGE_FEEDBACK);
/** "*" is in CSV form with data ids ("123,456,789") */
matcher.addURI(ContactsContract.AUTHORITY, "data/usagefeedback/*", DATA_USAGE_FEEDBACK_ID);
matcher.addURI(ContactsContract.AUTHORITY, "data/callables/", CALLABLES);
@@ -3337,6 +3337,10 @@
}
}
+ case CONTACTS_DELETE_USAGE: {
+ return deleteDataUsage();
+ }
+
case RAW_CONTACTS:
case PROFILE_RAW_CONTACTS: {
invalidateFastScrollingIndexCache();
@@ -3462,10 +3466,6 @@
new String[]{streamItemPhotoId, streamItemId});
}
- case DATA_USAGE_FEEDBACK: {
- return deleteDataUsageFeedback();
- }
-
default: {
mSyncToNetwork = true;
return mLegacyApiSupport.delete(uri, selection, selectionArgs);
@@ -3623,7 +3623,7 @@
return updateRawContact(rawContactId, mValues, callerIsSyncAdapter);
}
- private int deleteDataUsageFeedback() {
+ private int deleteDataUsage() {
final SQLiteDatabase db = mActiveDb.get();
db.execSQL("UPDATE " + Tables.RAW_CONTACTS + " SET " +
Contacts.TIMES_CONTACTED + "=0," +
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index d121d13..1a6b1b1 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -6489,7 +6489,7 @@
}
}
- public void testDeleteDataUsageFeedback() {
+ public void testDeleteDataUsage() {
// First, there's no frequent. (We use strequent here only because frequent is hidden
// and may be removed someday.)
assertRowCount(0, Contacts.CONTENT_STREQUENT_URI, null, null);
@@ -6507,7 +6507,7 @@
assertRowCount(1, RawContacts.CONTENT_URI, RawContacts.TIMES_CONTACTED + ">0", null);
// Purge all stats.
- assertTrue(mResolver.delete(DataUsageFeedback.FEEDBACK_URI, null, null) > 0);
+ assertTrue(mResolver.delete(DataUsageFeedback.DELETE_USAGE_URI, null, null) > 0);
// Now there's no frequent.
assertRowCount(0, Contacts.CONTENT_STREQUENT_URI, null, null);
@@ -6519,7 +6519,7 @@
assertRowCount(0, RawContacts.CONTENT_URI, RawContacts.LAST_TIME_CONTACTED + ">0", null);
// Calling it when there's no usage stats will still return a positive value.
- assertTrue(mResolver.delete(DataUsageFeedback.FEEDBACK_URI, null, null) > 0);
+ assertTrue(mResolver.delete(DataUsageFeedback.DELETE_USAGE_URI, null, null) > 0);
}
private Cursor queryGroupMemberships(Account account) {