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

Commit f690ee19 authored by Conley Owens's avatar Conley Owens
Browse files

Merge commit 'ddf58791' into m 

Conflicts:
	src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
	src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

Change-Id: Ib3533b9713373c84636940dbe3e41203898aef46
parents 0633e1d6 ddf58791

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

+5 −6
Original line number Diff line number Diff line
@@ -122,22 +122,21 @@ public class BluetoothPbapCallLogComposer { 
        return true;

    }



    public String createOneEntry() {

    public String createOneEntry(boolean vcardVer21) {

        if (mCursor == null || mCursor.isAfterLast()) {

            mErrorReason = FAILURE_REASON_NOT_INITIALIZED;

            return null;

        }

        try {

            return createOneCallLogEntryInternal();

            return createOneCallLogEntryInternal(vcardVer21);

        } finally {

            mCursor.moveToNext();

        }

    }



    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 |

    private String createOneCallLogEntryInternal(boolean vcardVer21) {

        final int vcardType = (vcardVer21 ? VCardConfig.VCARD_TYPE_V21_GENERIC :

                VCardConfig.VCARD_TYPE_V30_GENERIC) |

                VCardConfig.FLAG_REFRAIN_PHONE_NUMBER_FORMATTING;

        final VCardBuilder builder = new VCardBuilder(vcardType);

        String name = mCursor.getString(CALLER_NAME_COLUMN_INDEX);

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

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ public class BluetoothPbapVcardManager { 
                        BluetoothPbapObexServer.sIsAborted = false;

                        break;

                    }

                    String vcard = composer.createOneEntry();

                    String vcard = composer.createOneEntry(vcardType21);

                    if (vcard == null) {

                        Log.e(TAG, "Failed to read a contact. Error reason: "

                                + composer.getErrorReason());