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

Commit 937ad3c8 authored by Hui Peng's avatar Hui Peng
Browse files

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

[conflict resolved] Merge "Add validation on sdp attributes in bta_ag_sdp.cc" into tm-dev am: b4aaf94b am: 5dea751e am: e97b8eb2 am: 4c35207e

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



Merged-In: I0b3daa4f14123f06fdbbdcca8e79c761af007577
Merged-In: I51c0215125808102b6cff880357d19012ffc37b9
Merged-In: I71a3cc89cf25757d75263528d2d1028f14cfe6ae
Change-Id: I888108d4c10dd3cfda9318871f353c84bddd4d02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f50a0407 4c35207e

system/bta/ag/bta_ag_sdp.cc

+6 −2
Original line number Diff line number Diff line
@@ -400,7 +400,9 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
      /* get features if HFP */

      p_attr = get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

          p_rec, ATTR_ID_SUPPORTED_FEATURES);

      if (p_attr != nullptr) {

      if (p_attr != nullptr &&

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

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

        /* Found attribute. Get value. */

        /* There might be race condition between SDP and BRSF.  */

        /* Do not update if we already received BRSF.           */
@@ -446,7 +448,9 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
      /* get features if HSP */

      p_attr = get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

          p_rec, ATTR_ID_REMOTE_AUDIO_VOLUME_CONTROL);

      if (p_attr != nullptr) {

      if (p_attr != nullptr &&

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

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

        /* Remote volume control of HSP */

        if (p_attr->attr_value.v.u8)

          p_scb->peer_features |= BTA_AG_PEER_FEAT_VOL;