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

Commit 71e78a6f authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Add sink only/source only senarios" am: 624e50d9 am: 304772ef am:... 

Merge "Add sink only/source only senarios" am: 624e50d9 am: 304772ef am: 696cf2f9 am: e3aee9fe am: c9dfa2f8

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2171022



Change-Id: I1417a5a18c4252779e305fe5f1f63a45f1627101
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa4d42a9 c9dfa2f8

system/bta/le_audio/audio_set_configurations.json

+898 −80

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/le_audio/audio_set_scenarios.json

+12 −0
Original line number Original line Diff line number Diff line
@@ -91,8 +91,16 @@ 
                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1",

                "SingleDev_OneChanMonoSnk_OneChanMonoSrc_16_1_1",

                "DualDev_OneChanMonoSrc_16_2_Server_Preferred",

                "DualDev_OneChanMonoSrc_16_2_Server_Preferred",

                "SingleDev_OneChanStereoSrc_16_2_Server_Preferred",

                "SingleDev_OneChanStereoSrc_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSrc_48_4_Server_Preferred",

                "SingleDev_OneChanMonoSrc_48_3_Server_Preferred",

                "SingleDev_OneChanMonoSrc_48_2_Server_Preferred",

                "SingleDev_OneChanMonoSrc_48_1_Server_Preferred",

                "SingleDev_OneChanMonoSrc_32_2_Server_Preferred",

                "SingleDev_OneChanMonoSrc_32_1_Server_Preferred",

                "SingleDev_OneChanMonoSrc_24_2_Server_Preferred",

                "SingleDev_OneChanMonoSrc_24_2_Server_Preferred",

                "SingleDev_OneChanMonoSrc_24_1_Server_Preferred",

                "SingleDev_OneChanMonoSrc_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSrc_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSrc_16_1_Server_Preferred",

                "VND_SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32khz_Server_Prefered_1",

                "VND_SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32khz_Server_Prefered_1",

                "VND_SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32khz_60oct_R3_L22_1"

                "VND_SingleDev_TwoChanStereoSnk_TwoChanStereoSrc_32khz_60oct_R3_L22_1"

            ]

            ]
@@ -152,6 +160,10 @@ 
                "SingleDev_OneChanMonoSnk_48_2_2",

                "SingleDev_OneChanMonoSnk_48_2_2",

                "SingleDev_OneChanMonoSnk_48_1_Server_Preferred",

                "SingleDev_OneChanMonoSnk_48_1_Server_Preferred",

                "SingleDev_OneChanMonoSnk_48_1_2",

                "SingleDev_OneChanMonoSnk_48_1_2",

                "SingleDev_OneChanMonoSnk_32_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_32_2_2",

                "SingleDev_OneChanMonoSnk_32_1_Server_Preferred",

                "SingleDev_OneChanMonoSnk_32_1_2",

                "SingleDev_OneChanMonoSnk_24_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_24_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_24_2_2",

                "SingleDev_OneChanMonoSnk_24_2_2",

                "SingleDev_OneChanMonoSnk_16_2_Server_Preferred",

                "SingleDev_OneChanMonoSnk_16_2_Server_Preferred",

system/bta/le_audio/devices_test.cc

+6 −1
Original line number Original line Diff line number Diff line
@@ -207,13 +207,18 @@ bool IsLc3SettingSupported(LeAudioContextType context_type, Lc3SettingId id) { 




    case LeAudioContextType::CONVERSATIONAL:

    case LeAudioContextType::CONVERSATIONAL:

      if (id == Lc3SettingId::LC3_16_1 || id == Lc3SettingId::LC3_16_2 ||

      if (id == Lc3SettingId::LC3_16_1 || id == Lc3SettingId::LC3_16_2 ||

          id == Lc3SettingId::LC3_24_2 || id == Lc3SettingId::LC3_32_2)

          id == Lc3SettingId::LC3_24_1 || id == Lc3SettingId::LC3_24_2 ||

          id == Lc3SettingId::LC3_32_1 || id == Lc3SettingId::LC3_32_2 ||

          id == Lc3SettingId::LC3_48_1 || id == Lc3SettingId::LC3_48_2 ||

          id == Lc3SettingId::LC3_48_3 || id == Lc3SettingId::LC3_48_4 ||

          id == Lc3SettingId::LC3_VND_1)

        return true;

        return true;





      break;

      break;





    case LeAudioContextType::MEDIA:

    case LeAudioContextType::MEDIA:

      if (id == Lc3SettingId::LC3_16_1 || id == Lc3SettingId::LC3_16_2 ||

      if (id == Lc3SettingId::LC3_16_1 || id == Lc3SettingId::LC3_16_2 ||

          id == Lc3SettingId::LC3_32_1 || id == Lc3SettingId::LC3_32_2 ||

          id == Lc3SettingId::LC3_48_4 || id == Lc3SettingId::LC3_48_2 ||

          id == Lc3SettingId::LC3_48_4 || id == Lc3SettingId::LC3_48_2 ||

          id == Lc3SettingId::LC3_VND_1 || id == Lc3SettingId::LC3_24_2)

          id == Lc3SettingId::LC3_VND_1 || id == Lc3SettingId::LC3_24_2)

        return true;

        return true;