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

Commit 9f40c820 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bt_dynamic_avrcp" into tm-d1-dev am: e957c087 am:... 

Merge changes from topic "bt_dynamic_avrcp" into tm-d1-dev am: e957c087 am: 20b9ecef am: 3683b310

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



Change-Id: Iddcc873627c838bc0298430af78ada6c30445e3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc94731c 3683b310

system/profile/avrcp/connection_handler.cc

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb, 
        }

      }



      if (osi_property_get_bool(AVRC_DYNAMIC_AVRCP_ENABLE_PROPERTY, false)) {

      if (osi_property_get_bool(AVRC_DYNAMIC_AVRCP_ENABLE_PROPERTY, true)) {

        avrc_->SaveControllerVersion(bdaddr, peer_avrcp_version);

      }

    }

system/stack/sdp/sdp_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, 


  // Dynamic ACRCP version. If our version high than remote device's version,

  // reply version same as its. Otherwise, reply default version.

  if (!osi_property_get_bool(AVRC_DYNAMIC_AVRCP_ENABLE_PROPERTY, false)) {

  if (!osi_property_get_bool(AVRC_DYNAMIC_AVRCP_ENABLE_PROPERTY, true)) {

    LOG_INFO(

        "Dynamic AVRCP version feature is not enabled, skipping this method");

    return;