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

Commit d6707153 authored by Antoine Soulier's avatar Antoine Soulier Committed by Gerrit Code Review
Browse files

Merge changes I65e98ce8,Id54106d9 

* changes:
  PtsBot: Add A/V_RemoteControlController to SDP expected services
  [avrcp] Fix version of controller
parents 05aae900 858c0bc2

android/pandora/mmi2grpc/mmi2grpc/sdp.py

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ UUID_TO_SERVICE_NAME = { 
    0x110A: "AudioSource",

    0x110C: "A/V_RemoteControlTarget",

    0x110E: "A/V_RemoteControl",

    0x110F: "A/V_RemoteControlController",

    0x1112: "Headset - Audio Gateway",

    0x1115: "PANU",

    0x1116: "NAP",
@@ -102,6 +103,7 @@ class SDPProxy(ProfileProxy): 
            "AudioSource",

            "A/V_RemoteControlTarget",

            "A/V_RemoteControl",

            "A/V_RemoteControlController",

            "Headset - Audio Gateway",

            "GenericAudio",

            "HandsfreeAudioGateway",

system/stack/avrc/avrc_api.cc

+5 −1
Original line number Diff line number Diff line
@@ -981,10 +981,14 @@ static BT_HDR* avrc_pass_msg(tAVRC_MSG_PASS* p_msg) { 
 *

 *****************************************************************************/

uint16_t AVRC_GetControlProfileVersion() {

  char volume_disabled[PROPERTY_VALUE_MAX] = {0};

  osi_property_get("persist.bluetooth.disableabsvol", volume_disabled, "false");



  uint16_t profile_version = AVRC_REV_1_3;

  char avrcp_version[PROPERTY_VALUE_MAX] = {0};

  osi_property_get(AVRC_CONTROL_VERSION_PROPERTY, avrcp_version,

                   AVRC_1_3_STRING);

                   strncmp(volume_disabled, "true", 4) == 0 ? AVRC_1_3_STRING

                                                            : AVRC_1_4_STRING);



  if (!strncmp(AVRC_1_6_STRING, avrcp_version, sizeof(AVRC_1_6_STRING))) {

    profile_version = AVRC_REV_1_6;