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

Commit b497b05a authored by Eri Kasamatsu's avatar Eri Kasamatsu Committed by android-build-merger
Browse files

Merge "PBAP: Add SOUND property support to vCard 2.1" am: eb0c5844 

am: a0871bbb

Change-Id: Iaefa13bd4bb7df03cc53a72f27e143782fe72f71
parents 2eb037cb a0871bbb

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

+3 −0
Original line number Diff line number Diff line
@@ -691,6 +691,8 @@ public class BluetoothPbapVcardManager { 
            int vcardType;

            if (vcardType21) {

                vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC;

                vcardType |= VCardConfig.FLAG_CONVERT_PHONETIC_NAME_STRINGS;

                vcardType |= VCardConfig.FLAG_REFRAIN_QP_TO_NAME_PROPERTIES;

            } else {

                vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC;

            }
@@ -1074,6 +1076,7 @@ public class BluetoothPbapVcardManager { 
            TITLE(12, "TITLE", false, false),

            ORG(16, "ORG", false, false),

            NOTE(17, "NOTE", false, false),

            SOUND(19, "SOUND", false, false),

            URL(20, "URL", false, false),

            NICKNAME(23, "NICKNAME", false, true),

            DATETIME(28, "X-IRMC-CALL-DATETIME", false, false);