Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aff4bb3e authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android Git Automerger
Browse files

am f8d3eea3: Adapt to the new interface of vCard code. 

Merge commit 'f8d3eea3'

* commit 'f8d3eea3':
  Adapt to the new interface of vCard code.
parents 9f292aa5 f8d3eea3

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

+3 −10
Original line number Diff line number Diff line
@@ -367,17 +367,10 @@ public class BluetoothPbapVcardManager { 
                vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC;

            }



            if (isContacts) {

                // create VCardComposer for contacts

            composer = new VCardComposer(mContext, vcardType, true);

            } else {

                // create VCardComposer for call logs

                composer = new VCardComposer(mContext, vcardType, true, true);

            }



            composer.addHandler(new HandlerForStringBuffer(op, ownerVCard));



            if (!composer.init(selection, null)) {

            final Uri contentUri = (isContacts ? Contacts.CONTENT_URI : CallLog.Calls.CONTENT_URI); 

            if (!composer.init(contentUri, selection, null, null)) {

                return ResponseCodes.OBEX_HTTP_INTERNAL_ERROR;

            }