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

Commit 6cdf9d55 authored by Hui Peng's avatar Hui Peng
Browse files

[conflict resolved] Merge "Add validation on sdp attributes in bta_av_act.cc"... 

[conflict resolved] Merge "Add validation on sdp attributes in bta_av_act.cc" into tm-dev am: be6cf234 am: 1f136b06 am: 9b8c9970 am: 02a69d4c

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



Merged-In: I5286fabf49f14cba5ef65a79d6e1eadb40bbb514
Merged-In: I3231e4fdb39f30085425113358898fab7ec8e68c
Merged-In: I14d0aa83ea9868be7dc5660e014a331ddf9efd31
Change-Id: I669b2c79d93d5b43941db4515db15fab81e0361b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d32e75f4 02a69d4c

system/bta/av/bta_av_act.cc

+6 −2
Original line number Diff line number Diff line
@@ -1894,7 +1894,9 @@ tBTA_AV_FEAT bta_av_check_peer_features(uint16_t service_uuid) { 
        /* get supported categories */

        p_attr = get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

            p_rec, ATTR_ID_SUPPORTED_FEATURES);

        if (p_attr != NULL) {

        if (p_attr != NULL &&

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

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

          categories = p_attr->attr_value.v.u16;

          if (categories & AVRC_SUPF_CT_CAT2)

            peer_features |= (BTA_AV_FEAT_ADV_CTRL);
@@ -1960,7 +1962,9 @@ tBTA_AV_FEAT bta_avk_check_peer_features(uint16_t service_uuid) { 
      tSDP_DISC_ATTR* p_attr =

          get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

              p_rec, ATTR_ID_SUPPORTED_FEATURES);

      if (p_attr != NULL) {

      if (p_attr != NULL &&

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

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

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

        /*

         * Though Absolute Volume came after in 1.4 and above, but there are