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

Commit 927dc604 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "PBAP: Add filter support for Owner contact"

parents 3ff37b37 69415f7c

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

+4 −2
Original line number Diff line number Diff line
@@ -1194,7 +1194,8 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
                return ResponseCodes.OBEX_HTTP_NOT_FOUND;

            } else if (intIndex == 0) {

                // For PB_PATH, 0.vcf is the phone number of this phone.

                String ownerVcard = mVcardManager.getOwnerPhoneNumberVcard(vcard21, null);

                String ownerVcard = mVcardManager.getOwnerPhoneNumberVcard(vcard21,

                        appParamValue.ignorefilter ? null : appParamValue.propertySelector);

                return pushBytes(op, ownerVcard);

            } else {

                return mVcardManager.composeAndSendPhonebookOneVcard(op, intIndex, vcard21, null,
@@ -1272,7 +1273,8 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
        boolean vcard21 = appParamValue.vcard21;

        if (appParamValue.needTag == BluetoothPbapObexServer.ContentType.PHONEBOOK) {

            if (startPoint == 0) {

                String ownerVcard = mVcardManager.getOwnerPhoneNumberVcard(vcard21, null);

                String ownerVcard = mVcardManager.getOwnerPhoneNumberVcard(vcard21,

                        appParamValue.ignorefilter ? null : appParamValue.propertySelector);

                if (endPoint == 0) {

                    return pushBytes(op, ownerVcard);

                } else {