commit 01b56dd89394ef545d7bba0c9cf39a21481cbfac
author Ajay Panicker <apanicke@google.com> Tue Mar 20 14:27:51 2018 -0700
committer Ajay Panicker <apanicke@google.com> Tue Mar 20 14:45:06 2018 -0700
tree 28e477a34412d89b18eac782c6c3be61d1a2832d
parent 334f62d243a7387c05369165f58f447339076abd

Set the default AVRCP Version to 1.5

Bug: 76027180
Test: Compile and connect to remote device and see in SDP that the
      version reported is 1.5

Change-Id: I9ec88ca2127c3be055d7f64ccb8b3848cfed3fdf

system/bta/av/bta_av_main.cc

diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc
index 7ffa87d..dce336b 100644
--- a/system/bta/av/bta_av_main.cc
+++ b/system/bta/av/bta_av_main.cc
@@ -84,6 +84,10 @@
 #define AVRCP_1_3_STRING "avrcp13"
 #endif
 
+#ifndef AVRCP_DEFAULT_VERSION
+#define AVRCP_DEFAULT_VERSION AVRCP_1_5_STRING
+#endif
+
 /* state machine states */
 enum { BTA_AV_INIT_ST, BTA_AV_OPEN_ST };
 
@@ -407,7 +411,8 @@
   registr.chnl = (tBTA_AV_CHNL)p_data->hdr.layer_specific;
 
   char avrcp_version[PROPERTY_VALUE_MAX] = {0};
-  osi_property_get(AVRCP_VERSION_PROPERTY, avrcp_version, AVRCP_1_4_STRING);
+  osi_property_get(AVRCP_VERSION_PROPERTY, avrcp_version,
+                   AVRCP_DEFAULT_VERSION);
   LOG_INFO(LOG_TAG, "%s: AVRCP version used for sdp: \"%s\"", __func__,
            avrcp_version);