Merge "Fix phone_lookup related tests"
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 0c72085..21c85cd 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -422,11 +422,6 @@
public static final String GROUP_ROW_ID = GroupMembership.GROUP_ROW_ID;
}
- public interface PhoneColumns {
- public static final String NORMALIZED_NUMBER = Data.DATA4;
- public static final String CONCRETE_NORMALIZED_NUMBER = DataColumns.CONCRETE_DATA4;
- }
-
public interface GroupsColumns {
public static final String PACKAGE_ID = "package_id";
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index ed7c27d..2ca0c3c 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -31,7 +31,6 @@
import com.android.providers.contacts.ContactsDatabaseHelper.Joins;
import com.android.providers.contacts.ContactsDatabaseHelper.NameLookupColumns;
import com.android.providers.contacts.ContactsDatabaseHelper.NameLookupType;
-import com.android.providers.contacts.ContactsDatabaseHelper.PhoneColumns;
import com.android.providers.contacts.ContactsDatabaseHelper.PhoneLookupColumns;
import com.android.providers.contacts.ContactsDatabaseHelper.PhotoFilesColumns;
import com.android.providers.contacts.ContactsDatabaseHelper.PresenceColumns;
@@ -5393,13 +5392,13 @@
// if the row is for a sip address.
String isPhoneAndHasNormalized = "("
+ mimeTypeIsPhoneExpression + " AND "
- + PhoneColumns.NORMALIZED_NUMBER + " IS NOT NULL)";
+ + Phone.NORMALIZED_NUMBER + " IS NOT NULL)";
groupBy = "(CASE WHEN " + isPhoneAndHasNormalized
- + " THEN " + PhoneColumns.NORMALIZED_NUMBER
- + " ELSE " + Data.DATA1 + " END), " + RawContacts.CONTACT_ID;
+ + " THEN " + Phone.NORMALIZED_NUMBER
+ + " ELSE " + Phone.NUMBER + " END), " + RawContacts.CONTACT_ID;
} else {
- groupBy = "(CASE WHEN " + PhoneColumns.NORMALIZED_NUMBER
- + " IS NOT NULL THEN " + PhoneColumns.NORMALIZED_NUMBER
+ groupBy = "(CASE WHEN " + Phone.NORMALIZED_NUMBER
+ + " IS NOT NULL THEN " + Phone.NORMALIZED_NUMBER
+ " ELSE " + Phone.NUMBER + " END), " + RawContacts.CONTACT_ID;
}
if (sortOrder == null) {
diff --git a/src/com/android/providers/contacts/DataRowHandlerForPhoneNumber.java b/src/com/android/providers/contacts/DataRowHandlerForPhoneNumber.java
index 008d9cf..88e432e 100644
--- a/src/com/android/providers/contacts/DataRowHandlerForPhoneNumber.java
+++ b/src/com/android/providers/contacts/DataRowHandlerForPhoneNumber.java
@@ -15,7 +15,6 @@
*/
package com.android.providers.contacts;
-import com.android.providers.contacts.ContactsDatabaseHelper.PhoneColumns;
import com.android.providers.contacts.ContactsDatabaseHelper.PhoneLookupColumns;
import com.android.providers.contacts.ContactsDatabaseHelper.Tables;
import com.android.providers.contacts.SearchIndexManager.IndexBuilder;
@@ -48,7 +47,7 @@
String numberE164 =
PhoneNumberUtils.formatNumberToE164(number, mDbHelper.getCurrentCountryIso());
if (numberE164 != null) {
- values.put(PhoneColumns.NORMALIZED_NUMBER, numberE164);
+ values.put(Phone.NORMALIZED_NUMBER, numberE164);
}
dataId = super.insert(db, txContext, rawContactId, values);
@@ -76,7 +75,7 @@
mDbHelper.getCurrentCountryIso());
}
if (numberE164 != null) {
- values.put(PhoneColumns.NORMALIZED_NUMBER, numberE164);
+ values.put(Phone.NORMALIZED_NUMBER, numberE164);
}
}
diff --git a/tests/src/com/android/providers/contacts/GroupsTest.java b/tests/src/com/android/providers/contacts/GroupsTest.java
index 56b7100..ae95884 100644
--- a/tests/src/com/android/providers/contacts/GroupsTest.java
+++ b/tests/src/com/android/providers/contacts/GroupsTest.java
@@ -46,6 +46,7 @@
* com.android.providers.contacts.tests/android.test.InstrumentationTestRunner
* </code>
*/
+@MediumTest
public class GroupsTest extends BaseContactsProvider2Test {
private static final String GROUP_GREY = "Grey";
@@ -64,7 +65,6 @@
private static final String PHONE_CHARLIE_1 = "555-4444";
private static final String PHONE_CHARLIE_2 = "555-5555";
- @LargeTest
public void testGroupSummary() {
// Clear any existing data before starting
@@ -144,7 +144,6 @@
cursor.close();
}
- @MediumTest
public void testGroupDirtySetOnChange() {
Uri uri = ContentUris.withAppendedId(Groups.CONTENT_URI,
createGroup(mAccount, "gsid1", "title1"));
@@ -153,7 +152,6 @@
assertDirty(uri, false);
}
- @MediumTest
public void testMarkAsDirtyParameter() {
Uri uri = ContentUris.withAppendedId(Groups.CONTENT_URI,
createGroup(mAccount, "gsid1", "title1"));
@@ -166,7 +164,6 @@
assertDirty(uri, false);
}
- @MediumTest
public void testGroupDirtyClearedWhenSetExplicitly() {
Uri uri = ContentUris.withAppendedId(Groups.CONTENT_URI,
createGroup(mAccount, "gsid1", "title1"));
@@ -180,7 +177,6 @@
assertDirty(uri, false);
}
- @MediumTest
public void testGroupDeletion1() {
long groupId = createGroup(mAccount, "g1", "gt1");
Uri uri = ContentUris.withAppendedId(Groups.CONTENT_URI, groupId);
@@ -195,7 +191,6 @@
assertEquals(0, getCount(uri, null, null));
}
- @MediumTest
public void testGroupDeletion2() {
long groupId = createGroup(mAccount, "g1", "gt1");
Uri uri = ContentUris.withAppendedId(Groups.CONTENT_URI, groupId);
@@ -206,7 +201,6 @@
assertEquals(0, getCount(uri, null, null));
}
- @MediumTest
public void testGroupVersionUpdates() {
Uri uri = ContentUris.withAppendedId(Groups.CONTENT_URI,
createGroup(mAccount, "gsid1", "title1"));