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

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

am 74e8195a: Modify variables used in vCard code. 

Merge commit '74e8195a' into gingerbread-plus-aosp

* commit '74e8195a':
  Modify variables used in vCard code.
parents fcf7f88e 74e8195a

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

+3 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ public class BluetoothPbapCallLogComposer { 
    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_UTF8 |

        final int vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC |

                VCardConfig.FLAG_REFRAIN_PHONE_NUMBER_FORMATTING;

        final VCardBuilder builder = new VCardBuilder(vcardType);

        String name = mCursor.getString(CALLER_NAME_COLUMN_INDEX);
@@ -221,8 +221,8 @@ public class BluetoothPbapCallLogComposer { 
    public String composeVCardForPhoneOwnNumber(int phonetype, String phoneName,

            String phoneNumber, boolean vcardVer21) {

        final int vcardType = (vcardVer21 ?

                VCardConfig.VCARD_TYPE_V21_GENERIC_UTF8 :

                    VCardConfig.VCARD_TYPE_V30_GENERIC_UTF8) |

                VCardConfig.VCARD_TYPE_V21_GENERIC :

                    VCardConfig.VCARD_TYPE_V30_GENERIC) |

                VCardConfig.FLAG_REFRAIN_PHONE_NUMBER_FORMATTING;

        final VCardBuilder builder = new VCardBuilder(vcardType);

        boolean needCharset = false;

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

+2 −2
Original line number Diff line number Diff line
@@ -428,9 +428,9 @@ public class BluetoothPbapVcardManager { 
                // Currently only support Generic Vcard 2.1 and 3.0

                int vcardType;

                if (vcardType21) {

                    vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC_UTF8;

                    vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC;

                } else {

                    vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC_UTF8;

                    vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC;

                }

                vcardType |= VCardConfig.FLAG_REFRAIN_IMAGE_EXPORT;

                vcardType |= VCardConfig.FLAG_REFRAIN_PHONE_NUMBER_FORMATTING;