Modify variables used in vCard code.
See also Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
Change-Id: I3a94e86d0788a395ac0744bdf6e31c8e64fb0c15
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
index 3fc216f..74fefc8 100755
--- a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
@@ -189,7 +189,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 +221,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..8db1503 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
@@ -428,9 +428,9 @@
// 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;