diff options
author | Zheng Fu <zhengfu@google.com> | 2014-10-29 10:50:47 -0700 |
---|---|---|
committer | Zheng Fu <zhengfu@google.com> | 2014-10-30 16:52:15 -0700 |
commit | 77e675b050770c1bd68906c25859d7cdf8ea49db (patch) | |
tree | 67d80189f9f06b778b816a0d99348997e2e2283e /tests | |
parent | 3a219cc3f5045bdebfcd975bf857c6ff26886a22 (diff) | |
download | packages_providers_ContactsProvider-77e675b050770c1bd68906c25859d7cdf8ea49db.zip packages_providers_ContactsProvider-77e675b050770c1bd68906c25859d7cdf8ea49db.tar.gz packages_providers_ContactsProvider-77e675b050770c1bd68906c25859d7cdf8ea49db.tar.bz2 |
Fix broken test in ContactsProvider2Test.java
The test is broken due to the primary settings logic change in contact
aggregator (ag/542398), i.e. default settings are removed during contacts aggregation.
Bug:18118044
Change-Id: Ia4365c328d5a02367ba1842cecb9ff8cf08cfe3c
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/providers/contacts/ContactsProvider2Test.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java index 0145fef..0e4d9d6 100644 --- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java +++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java @@ -6430,12 +6430,12 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test { setAggregationException(AggregationExceptions.TYPE_KEEP_SEPARATE, rawContactId1, rawContactId2); + setAggregationException(AggregationExceptions.TYPE_KEEP_TOGETHER, + rawContactId1, rawContactId2); ContentValues values = new ContentValues(); values.put(Data.IS_SUPER_PRIMARY, 1); mResolver.update(photoUri2, values, null, null); - setAggregationException(AggregationExceptions.TYPE_KEEP_TOGETHER, - rawContactId1, rawContactId2); contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, queryContactId(rawContactId1)); assertStoredValue(contactUri, Contacts.PHOTO_ID, photoId2); |