diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-12-06 02:16:40 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-12-06 02:16:40 +0000 |
| commit | aecf604ef14f07e078c309b015c2333e22640789 (patch) | |
| tree | 3015ce491d513fb452665aa7f093138599800a20 /chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java | |
| parent | 0ab100671fdff8675ea1f74f15627f09c7f7506f (diff) | |
| parent | 3e8176df16950c067bcb1b37e62b2fc07d74065a (diff) | |
| download | android_frameworks_ex-aecf604ef14f07e078c309b015c2333e22640789.tar.gz android_frameworks_ex-aecf604ef14f07e078c309b015c2333e22640789.tar.bz2 android_frameworks_ex-aecf604ef14f07e078c309b015c2333e22640789.zip | |
Merge tag 'android-4.4.1_r1' into HEADcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315ea
Android 4.4.1 Release 1
Diffstat (limited to 'chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java')
| -rw-r--r-- | chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java b/chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java index a1a1c7a..d4c0460 100644 --- a/chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java +++ b/chips/tests/src/com/android/ex/chips/RecipientAlternatesAdapterTest.java @@ -120,7 +120,8 @@ public class RecipientAlternatesAdapterTest extends AndroidTestCase { { final RecipientEntry entry1 = RecipientEntry.constructTopLevelEntry("Android", DisplayNameSources.NICKNAME, - "1@android.com", 0, null, 0, 0, (Uri) null, true); + "1@android.com", 0, null, 0, 0, (Uri) null, true, + false /* isGalContact */); final RecipientEntry entry2 = RecipientEntry.constructFakeEntry("1@android.com", true); assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry1, entry2), entry1); @@ -132,10 +133,12 @@ public class RecipientAlternatesAdapterTest extends AndroidTestCase { { final RecipientEntry entry1 = RecipientEntry.constructTopLevelEntry("Android", DisplayNameSources.NICKNAME, - "1@android.com", 0, null, 0, 0, (Uri) null, true); + "1@android.com", 0, null, 0, 0, (Uri) null, true, + false /* isGalContact */); final RecipientEntry entry2 = RecipientEntry.constructTopLevelEntry("2@android.com", DisplayNameSources.EMAIL, - "2@android.com", 0, null, 0, 0, (Uri) null, true); + "2@android.com", 0, null, 0, 0, (Uri) null, true, + false /* isGalContact */); assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry1, entry2), entry1); assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry2, entry1), entry1); @@ -146,10 +149,11 @@ public class RecipientAlternatesAdapterTest extends AndroidTestCase { final RecipientEntry entry1 = RecipientEntry.constructTopLevelEntry("Android", DisplayNameSources.NICKNAME, "1@android.com", 0, null, 0, 0, Uri.parse("http://www.android.com"), - true); + true, false /* isGalContact */); final RecipientEntry entry2 = RecipientEntry.constructTopLevelEntry("Android", DisplayNameSources.EMAIL, - "2@android.com", 0, null, 0, 0, (Uri) null, true); + "2@android.com", 0, null, 0, 0, (Uri) null, true, + false /* isGalContact */); assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry1, entry2), entry1); assertEquals(RecipientAlternatesAdapter.getBetterRecipient(entry2, entry1), entry1); |