Merge change 21997 into eclair
* changes:
A test for ContactsContract.Contacts.getPhotoUri
diff --git a/src/com/android/providers/contacts/OpenHelper.java b/src/com/android/providers/contacts/OpenHelper.java
index 0e96b46..45a157f 100644
--- a/src/com/android/providers/contacts/OpenHelper.java
+++ b/src/com/android/providers/contacts/OpenHelper.java
@@ -60,7 +60,7 @@
/* package */ class OpenHelper extends SQLiteOpenHelper {
private static final String TAG = "OpenHelper";
- private static final int DATABASE_VERSION = 70;
+ private static final int DATABASE_VERSION = 71;
private static final String DATABASE_NAME = "contacts2.db";
private static final String DATABASE_PRESENCE = "presence_db";
@@ -734,7 +734,7 @@
Groups.SYSTEM_ID + " TEXT," +
Groups.DELETED + " INTEGER NOT NULL DEFAULT 0," +
Groups.GROUP_VISIBLE + " INTEGER NOT NULL DEFAULT 0," +
- Groups.SHOULD_SYNC + " INTEGER NOT NULL," +
+ Groups.SHOULD_SYNC + " INTEGER NOT NULL DEFAULT 1," +
Groups.SYNC1 + " TEXT, " +
Groups.SYNC2 + " TEXT, " +
Groups.SYNC3 + " TEXT, " +
@@ -1445,7 +1445,7 @@
*/
static final String[] sAllowedPackages = new String[] {
"com.android.contacts",
- "com.facebook",
+ "com.facebook.katana",
};
/**
diff --git a/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java b/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java
new file mode 100644
index 0000000..69b3fa3
--- /dev/null
+++ b/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.providers.contacts;
+
+import com.android.internal.telephony.CallerInfo;
+
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract.RawContacts;
+import android.test.suitebuilder.annotation.LargeTest;
+
+/**
+ * Integration test for {@link CallerInfo} and {@link ContactsProvider2}.
+ *
+ * Run the test like this:
+ * <code>
+ * adb shell am instrument -w \
+ * com.android.providers.contacts.tests/android.test.InstrumentationTestRunner
+ * </code>
+ */
+@LargeTest
+public class CallerInfoIntegrationTest extends BaseContactsProvider2Test {
+
+ public void testCallerInfo() {
+ ContentValues values = new ContentValues();
+ values.put(RawContacts.CUSTOM_RINGTONE, "ring");
+ values.put(RawContacts.SEND_TO_VOICEMAIL, 1);
+
+ Uri rawContactUri = mResolver.insert(RawContacts.CONTENT_URI, values);
+ long rawContactId = ContentUris.parseId(rawContactUri);
+
+ insertStructuredName(rawContactId, "Hot", "Tamale");
+ insertPhoneNumber(rawContactId, "800-466-4411");
+
+ CallerInfo callerInfo = CallerInfo.getCallerInfo(getProvider().getContext(), "18004664411");
+ assertEquals("800-466-4411", callerInfo.phoneNumber);
+ assertEquals("Home", callerInfo.phoneLabel);
+ assertEquals("Hot Tamale", callerInfo.name);
+ assertEquals("ring", String.valueOf(callerInfo.contactRingtoneUri));
+ assertEquals(true, callerInfo.shouldSendToVoicemail);
+ assertEquals("content://com.android.contacts/phone_lookup/18004664411",
+ String.valueOf(callerInfo.contactRefUri));
+ }
+}