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

Commit 1892a884 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update AVRCP default version to 1.5" into sc-qpr1-dev

parents e418244d 838470fd

system/bta/av/bta_av_main.cc

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

         *

         * We create 1.4 for SINK since we support browsing.

         * 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,

          bta_ar_reg_avrc(UUID_SERVCLASS_AV_REMOTE_CONTROL, NULL, NULL,

                          p_bta_av_cfg->avrc_ct_cat,

                          p_bta_av_cfg->avrc_ct_cat,

                          (bta_av_cb.features & BTA_AV_FEAT_BROWSE),

                          (bta_av_cb.features & BTA_AV_FEAT_BROWSE),

system/stack/include/avrc_api.h

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

#endif





#ifndef AVRC_DEFAULT_VERSION

#ifndef AVRC_DEFAULT_VERSION

#define AVRC_DEFAULT_VERSION AVRC_1_4_STRING

#define AVRC_DEFAULT_VERSION AVRC_1_5_STRING

#endif

#endif





/* Supported categories */

/* Supported categories */