am 44fbf5a3: am 8e658ce5: Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread
Merge commit '44fbf5a3537d1d701eedbd85e7115c36ef851c58'
* commit '44fbf5a3537d1d701eedbd85e7115c36ef851c58':
Send vCard with Unicode encoded Strings over BT
diff --git a/Android.mk b/Android.mk
index 0efe204..12f4db5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,7 @@
LOCAL_PACKAGE_NAME := Bluetooth
LOCAL_JAVA_LIBRARIES := javax.obex
+LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard
LOCAL_CERTIFICATE := platform
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
index 3fc216f..cccbd0d 100755
--- a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
@@ -22,17 +22,18 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteException;
import android.net.Uri;
-import android.pim.vcard.VCardBuilder;
-import android.pim.vcard.VCardConfig;
-import android.pim.vcard.VCardConstants;
-import android.pim.vcard.VCardUtils;
-import android.pim.vcard.VCardComposer.OneEntryHandler;
import android.provider.CallLog;
import android.provider.CallLog.Calls;
import android.text.TextUtils;
import android.text.format.Time;
import android.util.Log;
+import com.android.vcard.VCardBuilder;
+import com.android.vcard.VCardConfig;
+import com.android.vcard.VCardConstants;
+import com.android.vcard.VCardUtils;
+import com.android.vcard.VCardComposer.OneEntryHandler;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -189,7 +190,7 @@
private String createOneCallLogEntryInternal() {
// We should not allow vCard composer to re-format phone numbers, since
// some characters are (inappropriately) removed and devices do not work fine.
- final int vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC_UTF8 |
+ final int vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC |
VCardConfig.FLAG_REFRAIN_PHONE_NUMBER_FORMATTING;
final VCardBuilder builder = new VCardBuilder(vcardType);
String name = mCursor.getString(CALLER_NAME_COLUMN_INDEX);
@@ -221,8 +222,8 @@
public String composeVCardForPhoneOwnNumber(int phonetype, String phoneName,
String phoneNumber, boolean vcardVer21) {
final int vcardType = (vcardVer21 ?
- VCardConfig.VCARD_TYPE_V21_GENERIC_UTF8 :
- VCardConfig.VCARD_TYPE_V30_GENERIC_UTF8) |
+ VCardConfig.VCARD_TYPE_V21_GENERIC :
+ VCardConfig.VCARD_TYPE_V30_GENERIC) |
VCardConfig.FLAG_REFRAIN_PHONE_NUMBER_FORMATTING;
final VCardBuilder builder = new VCardBuilder(vcardType);
boolean needCharset = false;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
index 95bfe3b..29c64a8 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
@@ -36,9 +36,6 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import android.pim.vcard.VCardComposer;
-import android.pim.vcard.VCardConfig;
-import android.pim.vcard.VCardComposer.OneEntryHandler;
import android.provider.CallLog;
import android.provider.CallLog.Calls;
import android.provider.ContactsContract.CommonDataKinds;
@@ -49,6 +46,9 @@
import android.util.Log;
import com.android.bluetooth.R;
+import com.android.vcard.VCardComposer;
+import com.android.vcard.VCardConfig;
+import com.android.vcard.VCardComposer.OneEntryHandler;
import java.io.IOException;
import java.io.OutputStream;
@@ -428,11 +428,10 @@
// Currently only support Generic Vcard 2.1 and 3.0
int vcardType;
if (vcardType21) {
- vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC_UTF8;
+ vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC;
} else {
- vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC_UTF8;
+ vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC;
}
- vcardType |= VCardConfig.FLAG_REFRAIN_IMAGE_EXPORT;
vcardType |= VCardConfig.FLAG_REFRAIN_PHONE_NUMBER_FORMATTING;
composer = new VCardComposer(mContext, vcardType, true);