Use a static version of vCard library.

See also I435e1057.

Bug: 2689523
Change-Id: I6aaa893d13ad2ff66f1439731ef7dbcf079b5011

Android.mk

@@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_PACKAGE_NAME := Bluetooth
 
 LOCAL_JAVA_LIBRARIES := javax.obex
+LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard
 
 LOCAL_CERTIFICATE := platform
 

src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java

@@ -20,17 +20,18 @@ import android.content.Context;
 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;

src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

@@ -36,9 +36,6 @@ import android.content.ContentResolver;
 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.text.TextUtils;
 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;