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

Commit 8762c79e authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge changes I3f999d40,Ic807df3b into tm-dev am: 96c76a94 

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



Change-Id: If8692d794a909ad4351a9dd007a1a97c294d37e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f783db62 96c76a94

system/profile/avrcp/connection_handler.cc

+6 −2
Original line number Original line Diff line number Diff line
@@ -471,7 +471,9 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb, 
        VLOG(1) << __PRETTY_FUNCTION__ << " Get Supported categories";

        VLOG(1) << __PRETTY_FUNCTION__ << " Get Supported categories";

        tSDP_DISC_ATTR* sdp_attribute =

        tSDP_DISC_ATTR* sdp_attribute =

            sdp_->FindAttributeInRec(sdp_record, ATTR_ID_SUPPORTED_FEATURES);

            sdp_->FindAttributeInRec(sdp_record, ATTR_ID_SUPPORTED_FEATURES);

        if (sdp_attribute != NULL) {

        if (sdp_attribute != NULL &&

            SDP_DISC_ATTR_TYPE(sdp_attribute->attr_len_type) == UINT_DESC_TYPE &&

            SDP_DISC_ATTR_LEN(sdp_attribute->attr_len_type) >= 2) {

          VLOG(1) << __PRETTY_FUNCTION__

          VLOG(1) << __PRETTY_FUNCTION__

                  << "Get Supported categories SDP ATTRIBUTES != null";

                  << "Get Supported categories SDP ATTRIBUTES != null";

          uint16_t categories = sdp_attribute->attr_value.v.u16;

          uint16_t categories = sdp_attribute->attr_value.v.u16;
@@ -516,7 +518,9 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb, 
        VLOG(1) << __PRETTY_FUNCTION__ << " Get Supported categories";

        VLOG(1) << __PRETTY_FUNCTION__ << " Get Supported categories";

        tSDP_DISC_ATTR* sdp_attribute =

        tSDP_DISC_ATTR* sdp_attribute =

            sdp_->FindAttributeInRec(sdp_record, ATTR_ID_SUPPORTED_FEATURES);

            sdp_->FindAttributeInRec(sdp_record, ATTR_ID_SUPPORTED_FEATURES);

        if (sdp_attribute != NULL) {

        if (sdp_attribute != NULL &&

            SDP_DISC_ATTR_TYPE(sdp_attribute->attr_len_type) == UINT_DESC_TYPE &&

            SDP_DISC_ATTR_LEN(sdp_attribute->attr_len_type) >= 2) {

          VLOG(1) << __PRETTY_FUNCTION__

          VLOG(1) << __PRETTY_FUNCTION__

                  << "Get Supported categories SDP ATTRIBUTES != null";

                  << "Get Supported categories SDP ATTRIBUTES != null";

          uint16_t categories = sdp_attribute->attr_value.v.u16;

          uint16_t categories = sdp_attribute->attr_value.v.u16;