summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDaniel Lehmann <lehmannd@google.com>2010-08-13 15:28:53 -0700
committerDaniel Lehmann <lehmannd@google.com>2010-08-13 15:38:59 -0700
commitd9b5910dcb5cf99c4e4a81a794d5e81e17e4992e (patch)
tree918d9098a294f4e908404fef0d96c25dd9df777e /tests
parent892a3d9ded5c64a63ae3d5d5c52c59528b466c93 (diff)
downloadpackages_providers_ContactsProvider-d9b5910dcb5cf99c4e4a81a794d5e81e17e4992e.zip
packages_providers_ContactsProvider-d9b5910dcb5cf99c4e4a81a794d5e81e17e4992e.tar.gz
packages_providers_ContactsProvider-d9b5910dcb5cf99c4e4a81a794d5e81e17e4992e.tar.bz2
Update flags to be consistent with GTalk's
Change-Id: Ia56261e9c6a9378f70faa7c5b36d7586e0750a15
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/providers/contacts/ContactsProvider2Test.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 8882869..eea7157 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -1105,7 +1105,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
ContentValues values = new ContentValues();
long contactId = createContact(values, "John", "Doe",
"18004664411", "goog411@acme.com", StatusUpdates.INVISIBLE, 4, 1, 0,
- StatusUpdates.CAPABILITY_HAS_CAMERA | StatusUpdates.CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY);
+ StatusUpdates.CAPABILITY_HAS_CAMERA | StatusUpdates.CAPABILITY_HAS_VIDEO);
Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
assertStoredValues(contactUri, values);
@@ -1128,7 +1128,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
ContentValues values = new ContentValues();
long rawContactId = createRawContact(values, "18004664411",
"goog411@acme.com", StatusUpdates.INVISIBLE, 4, 1, 0,
- StatusUpdates.CAPABILITY_HAS_CAMERA | StatusUpdates.CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY |
+ StatusUpdates.CAPABILITY_HAS_CAMERA | StatusUpdates.CAPABILITY_HAS_VIDEO |
StatusUpdates.CAPABILITY_HAS_VOICE);
ContentValues nameValues = new ContentValues();
@@ -1170,7 +1170,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
ContentValues values1 = new ContentValues();
createContact(values1, "Noah", "Tever", "18004664411",
"a@acme.com", StatusUpdates.OFFLINE, 0, 0, 0,
- StatusUpdates.CAPABILITY_HAS_CAMERA | StatusUpdates.CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY);
+ StatusUpdates.CAPABILITY_HAS_CAMERA | StatusUpdates.CAPABILITY_HAS_VIDEO);
ContentValues values2 = new ContentValues();
createContact(values2, "Sam", "Times", "18004664412",
"b@acme.com", StatusUpdates.INVISIBLE, 3, 0, 0,
@@ -1178,11 +1178,11 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
ContentValues values3 = new ContentValues();
createContact(values3, "Lotta", "Calling", "18004664413",
"c@acme.com", StatusUpdates.AWAY, 5, 0, 0,
- StatusUpdates.CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY);
+ StatusUpdates.CAPABILITY_HAS_VIDEO);
ContentValues values4 = new ContentValues();
createContact(values4, "Fay", "Veritt", "18004664414",
"d@acme.com", StatusUpdates.AVAILABLE, 0, 1, 0,
- StatusUpdates.CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY | StatusUpdates.CAPABILITY_HAS_VOICE);
+ StatusUpdates.CAPABILITY_HAS_VIDEO | StatusUpdates.CAPABILITY_HAS_VOICE);
Cursor c = mResolver.query(Contacts.CONTENT_STREQUENT_URI, null, null, null,
Contacts._ID);
@@ -1953,7 +1953,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
// Match on IM (custom)
insertStatusUpdate(Im.PROTOCOL_CUSTOM, "my_im_proto", "my_im", StatusUpdates.IDLE, "Idle",
- StatusUpdates.CAPABILITY_HAS_CAMERA | StatusUpdates.CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY);
+ StatusUpdates.CAPABILITY_HAS_CAMERA | StatusUpdates.CAPABILITY_HAS_VIDEO);
// Match on Email
insertStatusUpdate(Im.PROTOCOL_GOOGLE_TALK, null, "m@acme.com", StatusUpdates.AWAY, "Away",