am 0aabafe3: (-s ours) am 037bb6c9: am bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE
Merge commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e'
* commit '0aabafe3bb8c8d1de6dfbc8b54509aac02f91a4e':
Fix string placeholders that got mangled in translation. DO NOT MERGE
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 74fefc8..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;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
index 8db1503..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;
@@ -432,7 +432,6 @@
} else {
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);