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

Commit caeb6151 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update AVRCP default version to 1.5" am: be8a91b6 am: 67fe0cb3 am:... 

Merge "Update AVRCP default version to 1.5" am: be8a91b6 am: 67fe0cb3 am: 69a8456b am: 5e196e2b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1827796

Change-Id: Iba2d32d0ea5ff28e08bd7d008eea42386d4acbc4
parents 5a390746 5e196e2b

system/bta/av/bta_av_main.cc

+2 −1
Original line number Diff line number Diff line
@@ -620,7 +620,8 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
         *

         * We create 1.4 for SINK since we support browsing.

         */

        if (profile_initialized == UUID_SERVCLASS_AUDIO_SOURCE) {

        if (profile_initialized == UUID_SERVCLASS_AUDIO_SOURCE &&

            !is_new_avrcp_enabled()) {

          bta_ar_reg_avrc(UUID_SERVCLASS_AV_REMOTE_CONTROL, NULL, NULL,

                          p_bta_av_cfg->avrc_ct_cat,

                          (bta_av_cb.features & BTA_AV_FEAT_BROWSE),

system/stack/include/avrc_api.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
#endif



#ifndef AVRC_DEFAULT_VERSION

#define AVRC_DEFAULT_VERSION AVRC_1_4_STRING

#define AVRC_DEFAULT_VERSION AVRC_1_5_STRING

#endif



/* Supported categories */