Commit: 6b3a12d3ad7fafa30341edc3ac125409f944d43b - system-bt (git)

system/bt

Commit MetaInfo

• Revision: 6b3a12d3ad7fafa30341edc3ac125409f944d43b (tree)
• Zeit: 2017-05-08 17:36:03
• Autor: siminy <siminy@code...>
• Commiter: Gerrit - the friendly Code Review server

Log Message

SDP: Add logic to downgrade PBAP version for blacklisted device

As some remote devices go in bad state on parsing PBAP 1.2 SDP record.
Add them to PBAP version downgrade blacklist.Upgrade PBAP version
downgrade logic from to include name based blacklist and also remove
SDP attributes not suppported in PBAP 1.1 specifications like
GoepL2capPsm, SupportedFeatures.

CRs-Fixed: 2038030
Change-Id: I7fdb0433353ba5793470313d205a68e8eb3fb5ac

Ändern Zusammenfassung

• modified: device/include/interop.h
• modified: device/include/interop_database.h
• modified: device/src/interop.c
• modified: stack/sdp/sdp_db.c
• modified: stack/sdp/sdp_server.c
• modified: stack/sdp/sdpint.h

Diff

--- a/device/include/interop.h
+++ b/device/include/interop.h
@@ -110,6 +110,11 @@ typedef enum {
   // Some car kits going bad state when DUT initiate profile connection in collision scenerio
   // Hence don't initaite profile level connections and wait for incoming connetcion
   INTEROP_DISABLE_CONNECTION_AFTER_COLLISION,
+
+  // Devices requiring this workaround do not handle Bluetooth PBAP 1.2 version correctly,
+  // leading them to go in bad state. So for better interoperability respond with PBAP 1.1
+  // as supported version.
+  INTEROP_ADV_PBAP_VER_1_1,
 } interop_feature_t;
 
 // Check if a given |addr| matches a known interoperability workaround as identified

--- a/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@ -127,6 +127,13 @@ static const interop_addr_entry_t interop_addr_database[] = {
   {{{0x04, 0xf8, 0xc2,      0,0,0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME},
   // HONDA HFT
   {{{0xA0, 0x14, 0x3D,      0,0,0}}, 3, INTEROP_DISABLE_CONNECTION_AFTER_COLLISION},
+
+  // Land Rover Carkit(s)
+  {{{0x00, 0x00, 0x31,      0,0,0}}, 3, INTEROP_ADV_PBAP_VER_1_1},
+  {{{0x00, 0x00, 0x41,      0,0,0}}, 3, INTEROP_ADV_PBAP_VER_1_1},
+  {{{0x00, 0x00, 0x6a,      0,0,0}}, 3, INTEROP_ADV_PBAP_VER_1_1},
+  {{{0x00, 0x00, 0x7f,      0,0,0}}, 3, INTEROP_ADV_PBAP_VER_1_1},
+  {{{0x00, 0x01, 0x0a,      0,0,0}}, 3, INTEROP_ADV_PBAP_VER_1_1},
 };
 
 typedef struct {
@@ -167,6 +174,9 @@ static const interop_name_entry_t interop_name_database[] = {
   {"Motorola Keyboard KZ500", 23, INTEROP_REMOVE_HID_DIG_DESCRIPTOR},
   {"Motorola Keyboard KZ500 v122", 28, INTEROP_REMOVE_HID_DIG_DESCRIPTOR},
   {"MB Bluetooth", 12, INTEROP_ADV_AVRCP_VER_1_3},
+
+  // Land Rover Carkit
+  {"Discovery Sport", 15, INTEROP_ADV_PBAP_VER_1_1},
 };
 
 typedef struct {

--- a/device/src/interop.c
+++ b/device/src/interop.c
@@ -60,7 +60,7 @@ bool interop_match_name(const interop_feature_t feature, const char *name) {
   const size_t db_size = sizeof(interop_name_database) / sizeof(interop_name_entry_t);
   for (size_t i = 0; i != db_size; ++i) {
     if (feature == interop_name_database[i].feature &&
-        strlen(name) >= interop_name_database[i].length &&
+        strlen(name) == interop_name_database[i].length &&
         strncmp(name, interop_name_database[i].name, interop_name_database[i].length) == 0) {
       LOG_WARN(LOG_TAG, "%s() Device with name: %s is a match for interop workaround %s", __func__,
           name, interop_feature_string_(feature));
@@ -157,6 +157,7 @@ static const char* interop_feature_string_(const interop_feature_t feature) {
     CASE_RETURN_STR(INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS)
     CASE_RETURN_STR(INTEROP_ADV_AVRCP_VER_1_3)
     CASE_RETURN_STR(INTEROP_DISABLE_CONNECTION_AFTER_COLLISION)
+    CASE_RETURN_STR(INTEROP_ADV_PBAP_VER_1_1)
   }
 
   return "UNKNOWN";

--- a/stack/sdp/sdp_db.c
+++ b/stack/sdp/sdp_db.c
@@ -398,7 +398,7 @@ BOOLEAN SDP_AddAttribute (UINT32 handle, UINT16 attr_id, UINT8 attr_type,
                           UINT32 attr_len, UINT8 *p_val)
 {
 #if SDP_SERVER_ENABLED == TRUE
-    UINT16          xx, yy, zz;
+    UINT16          xx;
     tSDP_RECORD     *p_rec = &sdp_cb.server_db.record[0];
 
 #if (BT_TRACE_VERBOSE == TRUE)
@@ -436,81 +436,84 @@ BOOLEAN SDP_AddAttribute (UINT32 handle, UINT16 attr_id, UINT8 attr_type,
 #endif
 
     /* Find the record in the database */
-    for (zz = 0; zz < sdp_cb.server_db.num_records; zz++, p_rec++)
+    for (xx = 0; xx < sdp_cb.server_db.num_records; xx++, p_rec++)
     {
         if (p_rec->record_handle == handle)
-        {
-            tSDP_ATTRIBUTE  *p_attr = &p_rec->attribute[0];
+            return SDP_AddAttributetoRecord (p_rec, attr_id, attr_type, attr_len, p_val);
+    }
+#endif
+    return (FALSE);
+}
 
-            /* Found the record. Now, see if the attribute already exists */
-            for (xx = 0; xx < p_rec->num_attributes; xx++, p_attr++)
-            {
-                /* The attribute exists. replace it */
-                if (p_attr->id == attr_id)
-                {
-                    SDP_DeleteAttribute (handle, attr_id);
-                    break;
-                }
-                if (p_attr->id > attr_id)
-                    break;
-            }
+BOOLEAN SDP_AddAttributetoRecord (tSDP_RECORD *p_rec, UINT16 attr_id, UINT8 attr_type,
+                                  UINT32 attr_len, UINT8 *p_val)
+{
+    UINT16 xx, yy;
+    tSDP_ATTRIBUTE  *p_attr = &p_rec->attribute[0];
+    /* Found the record. Now, see if the attribute already exists */
+    for (xx = 0; xx < p_rec->num_attributes; xx++, p_attr++)
+    {
+        /* The attribute exists. replace it */
+        if (p_attr->id == attr_id)
+        {
+            SDP_DeleteAttributefromRecord (p_rec, attr_id);
+            break;
+        }
+        if (p_attr->id > attr_id)
+            break;
+    }
 
-            if (p_rec->num_attributes == SDP_MAX_REC_ATTR)
-                return (FALSE);
+    if (p_rec->num_attributes == SDP_MAX_REC_ATTR)
+        return (FALSE);
 
-            /* If not found, see if we can allocate a new entry */
-            if (xx == p_rec->num_attributes)
-                p_attr = &p_rec->attribute[p_rec->num_attributes];
-            else
-            {
-                /* Since the attributes are kept in sorted order, insert ours here */
-                for (yy = p_rec->num_attributes; yy > xx; yy--)
-                    p_rec->attribute[yy] = p_rec->attribute[yy - 1];
-            }
+    /* If not found, see if we can allocate a new entry */
+    if (xx == p_rec->num_attributes)
+        p_attr = &p_rec->attribute[p_rec->num_attributes];
+    else
+    {
+        /* Since the attributes are kept in sorted order, insert ours here */
+        for (yy = p_rec->num_attributes; yy > xx; yy--)
+            p_rec->attribute[yy] = p_rec->attribute[yy - 1];
+    }
 
-            p_attr->id   = attr_id;
-            p_attr->type = attr_type;
-            p_attr->len  = attr_len;
+    p_attr->id   = attr_id;
+    p_attr->type = attr_type;
+    p_attr->len  = attr_len;
 
-            if (p_rec->free_pad_ptr + attr_len >= SDP_MAX_PAD_LEN)
-            {
-                /* do truncate only for text string type descriptor */
-                if (attr_type == TEXT_STR_DESC_TYPE)
-                {
-                    SDP_TRACE_WARNING("SDP_AddAttribute: attr_len:%d too long. truncate to (%d)",
-                        attr_len, SDP_MAX_PAD_LEN - p_rec->free_pad_ptr );
-
-                    attr_len = SDP_MAX_PAD_LEN - p_rec->free_pad_ptr;
-                    p_val[SDP_MAX_PAD_LEN - p_rec->free_pad_ptr] = '\0';
-                    p_val[SDP_MAX_PAD_LEN - p_rec->free_pad_ptr+1] = '\0';
-                }
-                else
-                    attr_len = 0;
-            }
+    if (p_rec->free_pad_ptr + attr_len >= SDP_MAX_PAD_LEN)
+    {
+        /* do truncate only for text string type descriptor */
+        if (attr_type == TEXT_STR_DESC_TYPE)
+        {
+            SDP_TRACE_WARNING("SDP_AddAttributetoRecord: attr_len:%d too long. truncate to (%d)",
+                attr_len, SDP_MAX_PAD_LEN - p_rec->free_pad_ptr );
 
-            if ((attr_len > 0) && (p_val != 0))
-            {
-                p_attr->len  = attr_len;
-                memcpy (&p_rec->attr_pad[p_rec->free_pad_ptr], p_val, (size_t)attr_len);
-                p_attr->value_ptr = &p_rec->attr_pad[p_rec->free_pad_ptr];
-                p_rec->free_pad_ptr += attr_len;
-            }
-            else if ((attr_len == 0 && p_attr->len != 0) || /* if truncate to 0 length, simply don't add */
-                      p_val == 0)
-            {
-                SDP_TRACE_ERROR("SDP_AddAttribute fail, length exceed maximum: ID %d: attr_len:%d ",
-                    attr_id, attr_len );
-                p_attr->id   = p_attr->type = p_attr->len  = 0;
-                return (FALSE);
-            }
-            p_rec->num_attributes++;
-            return (TRUE);
+            attr_len = SDP_MAX_PAD_LEN - p_rec->free_pad_ptr;
+            p_val[SDP_MAX_PAD_LEN - p_rec->free_pad_ptr] = '\0';
+            p_val[SDP_MAX_PAD_LEN - p_rec->free_pad_ptr+1] = '\0';
         }
+        else
+            attr_len = 0;
     }
-#endif
-    return (FALSE);
-}
 
+    if ((attr_len > 0) && (p_val != 0))
+    {
+        p_attr->len  = attr_len;
+        memcpy (&p_rec->attr_pad[p_rec->free_pad_ptr], p_val, (size_t)attr_len);
+        p_attr->value_ptr = &p_rec->attr_pad[p_rec->free_pad_ptr];
+        p_rec->free_pad_ptr += attr_len;
+    }
+    else if ((attr_len == 0 && p_attr->len != 0) || /* if truncate to 0 length, simply don't add */
+              p_val == 0)
+    {
+        SDP_TRACE_ERROR("SDP_AddAttributetoRecord fail, length exceed maximum: ID %d: attr_len:%d ",
+            attr_id, attr_len );
+        p_attr->id   = p_attr->type = p_attr->len  = 0;
+        return (FALSE);
+    }
+    p_rec->num_attributes++;
+    return (TRUE);
+}
 
 /*******************************************************************************
 **
@@ -705,7 +708,7 @@ BOOLEAN SDP_AddAdditionProtoLists (UINT32 handle, UINT16 num_elem,
         *p_len  = (UINT8)(p - p_len - 1);
     }
     result = SDP_AddAttribute (handle, ATTR_ID_ADDITION_PROTO_DESC_LISTS,DATA_ELE_SEQ_DESC_TYPE,
-	                           (UINT32) (p - p_buff), p_buff);
+            (UINT32) (p - p_buff), p_buff);
     osi_free(p_buff);
     return result;
 
@@ -757,6 +760,36 @@ BOOLEAN SDP_AddProfileDescriptorList (UINT32 handle, UINT16 profile_uuid,
 #endif
 }
 
+BOOLEAN SDP_AddProfileDescriptorListtoRecord (tSDP_RECORD *prec, UINT16 profile_uuid,
+                                      UINT16 version)
+{
+#if SDP_SERVER_ENABLED == TRUE
+    UINT8 *p;
+    BOOLEAN result;
+    UINT8 *p_buff = (UINT8 *)osi_malloc(sizeof(UINT8) * SDP_MAX_ATTR_LEN);
+
+    p = p_buff + 2;
+
+    /* First, build the profile descriptor list. This consists of a data element sequence. */
+    /* The sequence consists of profile's UUID and version number  */
+    UINT8_TO_BE_STREAM  (p, (UUID_DESC_TYPE << 3) | SIZE_TWO_BYTES);
+    UINT16_TO_BE_STREAM (p, profile_uuid);
+
+    UINT8_TO_BE_STREAM  (p, (UINT_DESC_TYPE << 3) | SIZE_TWO_BYTES);
+    UINT16_TO_BE_STREAM (p, version);
+
+    /* Add in type and length fields */
+    *p_buff = (UINT8) ((DATA_ELE_SEQ_DESC_TYPE << 3) | SIZE_IN_NEXT_BYTE);
+    *(p_buff+1) = (UINT8) (p - (p_buff+2));
+
+    result = SDP_AddAttributetoRecord (prec, ATTR_ID_BT_PROFILE_DESC_LIST,DATA_ELE_SEQ_DESC_TYPE, (UINT32) (p - p_buff), p_buff);
+    osi_free(p_buff);
+    return result;
+
+#else   /* SDP_SERVER_ENABLED == FALSE */
+    return (FALSE);
+#endif
+}
 
 /*******************************************************************************
 **
@@ -853,67 +886,75 @@ BOOLEAN SDP_AddServiceClassIdList (UINT32 handle, UINT16 num_services,
 BOOLEAN SDP_DeleteAttribute (UINT32 handle, UINT16 attr_id)
 {
 #if SDP_SERVER_ENABLED == TRUE
-    UINT16          xx, yy;
+    UINT16          xx;
     tSDP_RECORD     *p_rec = &sdp_cb.server_db.record[0];
-    UINT8           *pad_ptr;
-    UINT32  len;                        /* Number of bytes in the entry */
 
     /* Find the record in the database */
     for (xx = 0; xx < sdp_cb.server_db.num_records; xx++, p_rec++)
     {
         if (p_rec->record_handle == handle)
         {
-            tSDP_ATTRIBUTE  *p_attr = &p_rec->attribute[0];
-
             SDP_TRACE_API("Deleting attr_id 0x%04x for handle 0x%x", attr_id, handle);
-            /* Found it. Now, find the attribute */
-            for (xx = 0; xx < p_rec->num_attributes; xx++, p_attr++)
+            if (SDP_DeleteAttributefromRecord (p_rec, attr_id))
+                return (TRUE);
+        }
+    }
+#endif
+    /* If here, not found */
+    return (FALSE);
+}
+
+BOOLEAN SDP_DeleteAttributefromRecord (tSDP_RECORD *p_rec, UINT16 attr_id)
+{
+    UINT16          xx, yy;
+    tSDP_ATTRIBUTE  *p_attr = &p_rec->attribute[0];
+    UINT8           *pad_ptr;
+    UINT32  len;                        /* Number of bytes in the entry */
+
+    /* Found it. Now, find the attribute */
+    for (xx = 0; xx < p_rec->num_attributes; xx++, p_attr++)
+    {
+        if (p_attr->id == attr_id)
+        {
+            pad_ptr = p_attr->value_ptr;
+            len = p_attr->len;
+            if (p_rec->free_pad_ptr + p_attr->len >= SDP_MAX_PAD_LEN)
+            {
+                SDP_TRACE_ERROR("Deleting attr_id 0x%04x len %d exceeds 600", attr_id, len);
+                if (p_attr->type == TEXT_STR_DESC_TYPE)
+                    len = SDP_MAX_PAD_LEN - p_rec->free_pad_ptr;
+                else
+                    len = 0;
+            }
+            if (len)
             {
-                if (p_attr->id == attr_id)
+                for (yy = 0; yy < p_rec->num_attributes; yy++)
                 {
-                    pad_ptr = p_attr->value_ptr;
-                    len = p_attr->len;
-                    if (p_rec->free_pad_ptr + p_attr->len >= SDP_MAX_PAD_LEN)
-                    {
-                        SDP_TRACE_ERROR("Deleting attr_id 0x%04x len %d exceeds 600", attr_id, len);
-                        if (p_attr->type == TEXT_STR_DESC_TYPE)
-                            len = SDP_MAX_PAD_LEN - p_rec->free_pad_ptr;
-                        else
-                            len = 0;
-                    }
-                    if (len)
-                    {
-                        for (yy = 0; yy < p_rec->num_attributes; yy++)
-                        {
-                            if( p_rec->attribute[yy].value_ptr > pad_ptr )
-                                p_rec->attribute[yy].value_ptr -= len;
-                        }
-                    }
-
-                    /* Found it. Shift everything up one */
-                    p_rec->num_attributes--;
-
-                    for (yy = xx; yy < p_rec->num_attributes; yy++, p_attr++)
-                    {
-                        *p_attr = *(p_attr + 1);
-                    }
-
-                    /* adjust attribute values if needed */
-                    if (len)
-                    {
-                        xx = (p_rec->free_pad_ptr - ((pad_ptr+len) -
-                                                  &p_rec->attr_pad[0]));
-                        for( yy=0; yy<xx; yy++, pad_ptr++)
-                            *pad_ptr = *(pad_ptr+len);
-                        p_rec->free_pad_ptr -= len;
-                    }
-                    return (TRUE);
+                    if( p_rec->attribute[yy].value_ptr > pad_ptr )
+                        p_rec->attribute[yy].value_ptr -= len;
                 }
             }
+
+            /* Found it. Shift everything up one */
+            p_rec->num_attributes--;
+
+            for (yy = xx; yy < p_rec->num_attributes; yy++, p_attr++)
+            {
+                *p_attr = *(p_attr + 1);
+            }
+
+            /* adjust attribute values if needed */
+            if (len)
+            {
+                xx = (p_rec->free_pad_ptr - ((pad_ptr+len) -
+                                          &p_rec->attr_pad[0]));
+                for( yy=0; yy<xx; yy++, pad_ptr++)
+                    *pad_ptr = *(pad_ptr+len);
+                p_rec->free_pad_ptr -= len;
+            }
+            return (TRUE);
         }
     }
-#endif
-    /* If here, not found */
     return (FALSE);
 }
 

--- a/stack/sdp/sdp_server.c
+++ b/stack/sdp/sdp_server.c
@@ -59,6 +59,8 @@ extern fixed_queue_t *btu_general_alarm_queue;
 #define AVRCP_SUPPORTED_FEATURES_POSITION 1
 #define AVRCP_BROWSE_SUPPORT_BITMASK    0x40
 #define AVRCP_CA_SUPPORT_BITMASK        0x01
+#define PBAP_SKIP_GOEP_L2CAP_PSM_LEN    0x06
+#define PBAP_SKIP_SUPP_FEA_LEN          0x08
 
 /********************************************************************************/
 /*              L O C A L    F U N C T I O N     P R O T O T Y P E S            */
@@ -75,6 +77,10 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
                                              UINT16 param_len, UINT8 *p_req,
                                              UINT8 *p_req_end);
 
+static BOOLEAN is_pbap_record_blacklisted (tSDP_ATTRIBUTE attr, BD_ADDR remote_address);
+
+static tSDP_RECORD *sdp_update_pbap_record_if_blacklisted(tSDP_RECORD *p_rec,
+                                      BD_ADDR remote_address);
 
 /********************************************************************************/
 /*                  E R R O R   T E X T   S T R I N G S                         */
@@ -120,6 +126,8 @@ struct blacklist_entry
     char addr[3];
 };
 
+static tSDP_RECORD pbap_temp_sdp_rec;
+
 int sdp_get_stored_avrc_tg_version(BD_ADDR addr)
 {
     int stored_ver = AVRC_REV_INVALID;
@@ -632,6 +640,8 @@ static void process_service_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
         return;
     }
 
+    p_rec = sdp_update_pbap_record_if_blacklisted(p_rec, p_ccb->device_address);
+
     /* Free and reallocate buffer */
     osi_free(p_ccb->rsp_list);
     p_ccb->rsp_list = (UINT8 *)osi_malloc(max_list_len);
@@ -699,6 +709,7 @@ static void process_service_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
 #endif
 #endif
             is_hfp_fallback = sdp_change_hfp_version (p_attr, p_ccb->device_address);
+
             /* Check if attribute fits. Assume 3-byte value type/length */
             rem_len = max_list_len - (INT16) (p_rsp - &p_ccb->rsp_list[0]);
 
@@ -922,6 +933,7 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
     UINT8           *p_rsp, *p_rsp_start, *p_rsp_param_len;
     UINT16          rsp_param_len, xx;
     tSDP_RECORD    *p_rec;
+    tSDP_RECORD    *p_prev_rec;
     tSDP_ATTR_SEQ   attr_seq, attr_seq_sav;
     tSDP_ATTRIBUTE *p_attr;
     BT_HDR         *p_buf;
@@ -932,6 +944,7 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
     BOOLEAN         is_avrcp_ca_bit_reset = FALSE;
     UINT8           *p_seq_start = NULL;
     UINT16          seq_len, attr_len;
+    UINT16          blacklist_skip_len = 0;
     UNUSED(p_req_end);
 
     /* Extract the UUID sequence to search for */
@@ -958,7 +971,6 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
     }
 
     memcpy(&attr_seq_sav, &attr_seq, sizeof(tSDP_ATTR_SEQ)) ;
-
     /* Free and reallocate buffer */
     osi_free(p_ccb->rsp_list);
     p_ccb->rsp_list = (UINT8 *)osi_malloc(max_list_len);
@@ -1010,6 +1022,34 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
     for (p_rec = sdp_db_service_search (p_ccb->cont_info.prev_sdp_rec, &uid_seq); p_rec; p_rec = sdp_db_service_search (p_rec, &uid_seq))
     {
         p_ccb->cont_info.curr_sdp_rec = p_rec;
+        /* Store the actual record pointer which would be reused later */
+        p_prev_rec = p_rec;
+        p_rec = sdp_update_pbap_record_if_blacklisted(p_rec, p_ccb->device_address);
+        if (p_rec != p_prev_rec) {
+            /* Remote device is blacklisted for PBAP, calculate the reduction in length */
+            for (xx = p_ccb->cont_info.next_attr_index; xx < attr_seq_sav.num_attr; xx++) {
+                if (attr_seq_sav.attr_entry[xx].start == attr_seq_sav.attr_entry[xx].end) {
+                    if (attr_seq_sav.attr_entry[xx].start == ATTR_ID_GOEP_L2CAP_PSM) {
+                        blacklist_skip_len += PBAP_SKIP_GOEP_L2CAP_PSM_LEN;
+                        SDP_TRACE_ERROR("%s: ATTR_ID_GOEP_L2CAP_PSM requested,"
+                            " need to reduce length by %d", __func__,
+                            blacklist_skip_len);
+                    } else if (attr_seq_sav.attr_entry[xx].start ==
+                        ATTR_ID_PBAP_SUPPORTED_FEATURES) {
+                        blacklist_skip_len += PBAP_SKIP_SUPP_FEA_LEN;
+                        SDP_TRACE_DEBUG("%s: ATTR_ID_PBAP_SUPPORTED_FEATURES requested,"
+                            " need to reduce length by %d", __func__,
+                            blacklist_skip_len);
+                    }
+                } else {
+                    blacklist_skip_len = PBAP_SKIP_GOEP_L2CAP_PSM_LEN +
+                        PBAP_SKIP_SUPP_FEA_LEN;
+                    SDP_TRACE_DEBUG("%s: All attributes requested"
+                        " need to reduce length by %d", __func__,
+                        blacklist_skip_len);
+                }
+            }
+        }
         /* Allow space for attribute sequence type and length */
         p_seq_start = p_rsp;
         if (p_ccb->cont_info.last_attr_seq_desc_sent == FALSE)
@@ -1210,6 +1250,8 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
 
         /* Reset the next attr index */
         p_ccb->cont_info.next_attr_index = 0;
+        /* restore the record pointer.*/
+        p_rec = p_prev_rec;
         p_ccb->cont_info.prev_sdp_rec = p_rec;
         p_ccb->cont_info.last_attr_seq_desc_sent = FALSE;
     }
@@ -1244,6 +1286,13 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
     {
         /* Get the total list length for requested uid and attribute sequence */
         p_ccb->list_len = sdpu_get_list_len(&uid_seq, &attr_seq_sav) + 3;
+        if (blacklist_skip_len &&
+            p_ccb->list_len > blacklist_skip_len) {
+            p_ccb->list_len -= blacklist_skip_len;
+            SDP_TRACE_DEBUG("%s: reducing list_len by %d for blacklisted device",
+                __func__, blacklist_skip_len);
+            blacklist_skip_len = 0;
+        }
         /* Put in the sequence header (2 or 3 bytes) */
         if (p_ccb->list_len > 255)
         {
@@ -1285,6 +1334,14 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
 
     p_ccb->cont_offset += len_to_send;
 
+    if (blacklist_skip_len &&
+        p_ccb->list_len > blacklist_skip_len) {
+        p_ccb->list_len -= blacklist_skip_len;
+        SDP_TRACE_DEBUG("%s: reducing list_len by %d for blacklisted device",
+            __func__, blacklist_skip_len);
+        blacklist_skip_len = 0;
+    }
+
     /* If anything left to send, continuation needed */
     if (p_ccb->cont_offset < p_ccb->list_len)
     {
@@ -1308,4 +1365,91 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
     L2CA_DataWrite (p_ccb->connection_id, p_buf);
 }
 
+/*************************************************************************************
+**
+** Function        is_pbap_record_blacklisted
+**
+** Description     Checks if given PBAP record is for PBAP PSE and blacklisted
+**
+** Returns         BOOLEAN
+**
+***************************************************************************************/
+static BOOLEAN is_pbap_record_blacklisted (tSDP_ATTRIBUTE attr,
+                                      BD_ADDR remote_address)
+{
+    if ((attr.id == ATTR_ID_SERVICE_CLASS_ID_LIST) &&
+        (((attr.value_ptr[1] << 8) | (attr.value_ptr[2])) ==
+        UUID_SERVCLASS_PBAP_PSE))
+    {
+        bt_bdaddr_t remote_bdaddr;
+        bdcpy(remote_bdaddr.address, remote_address);
+
+        bt_property_t prop_name;
+        bt_bdname_t bdname;
+
+        memset(&bdname, 0, sizeof(bt_bdname_t));
+
+        BTIF_STORAGE_FILL_PROPERTY(&prop_name, BT_PROPERTY_BDNAME,
+                               sizeof(bt_bdname_t), &bdname);
+        if (btif_storage_get_remote_device_property(&remote_bdaddr,
+                                              &prop_name) != BT_STATUS_SUCCESS) {
+            SDP_TRACE_DEBUG("%s: BT_PROPERTY_BDNAME failed", __func__);
+        }
+        if (interop_match_addr(INTEROP_ADV_PBAP_VER_1_1, &remote_bdaddr) ||
+           (strlen((const char *)bdname.name) != 0 &&
+            interop_match_name(INTEROP_ADV_PBAP_VER_1_1,
+            (const char *)bdname.name))) {
+            SDP_TRACE_DEBUG("%s: device is blacklisted for pbap version downgrade", __func__);
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+/*************************************************************************************
+**
+** Function        sdp_update_pbap_record_if_blacklisted
+**
+** Description     updates pbap record after checking if blacklisted
+**
+** Returns         the address of updated record
+**
+***************************************************************************************/
+static tSDP_RECORD *sdp_update_pbap_record_if_blacklisted(tSDP_RECORD *p_rec,
+                                      BD_ADDR remote_address)
+{
+    /* Check if the given SDP record is blacklisted and requires updatiion */
+    if (is_pbap_record_blacklisted(p_rec->attribute[1], remote_address)) {
+        bool status = TRUE;
+        int xx;
+        UINT8 supported_repositories = 0x03;
+        UINT16 legacy_version = 0x0101;
+        memset(&pbap_temp_sdp_rec, 0, sizeof(tSDP_RECORD));
+
+        tSDP_ATTRIBUTE  *p_attr = &p_rec->attribute[0];
+
+        /* Copying contents of the PBAP PSE record to a temporary record */
+        for (xx = 0; xx < p_rec->num_attributes; xx++, p_attr++)
+            SDP_AddAttributetoRecord (&pbap_temp_sdp_rec, p_attr->id,
+            p_attr->type, p_attr->len, p_attr->value_ptr);
+
+        status &= SDP_DeleteAttributefromRecord (&pbap_temp_sdp_rec,
+            ATTR_ID_PBAP_SUPPORTED_FEATURES);
+        status &= SDP_DeleteAttributefromRecord (&pbap_temp_sdp_rec,
+            ATTR_ID_GOEP_L2CAP_PSM);
+        status &= SDP_AddAttributetoRecord (&pbap_temp_sdp_rec,
+            ATTR_ID_SUPPORTED_REPOSITORIES, UINT_DESC_TYPE, (UINT32)1,
+            (UINT8*)&supported_repositories);
+        status &= SDP_AddProfileDescriptorListtoRecord(&pbap_temp_sdp_rec,
+            UUID_SERVCLASS_PHONE_ACCESS, legacy_version);
+        if (!status) {
+            SDP_TRACE_ERROR("%s() FAILED", __func__);
+            return p_rec;
+        }
+        return &pbap_temp_sdp_rec;
+    }
+    return p_rec;
+}
+
 #endif  /* SDP_SERVER_ENABLED == TRUE */

--- a/stack/sdp/sdpint.h
+++ b/stack/sdp/sdpint.h
@@ -301,6 +301,11 @@ extern void sdpu_uuid16_to_uuid128(UINT16 uuid16, UINT8* p_uuid128);
 extern tSDP_RECORD    *sdp_db_service_search (tSDP_RECORD *p_rec, tSDP_UUID_SEQ *p_seq);
 extern tSDP_RECORD    *sdp_db_find_record (UINT32 handle);
 extern tSDP_ATTRIBUTE *sdp_db_find_attr_in_rec (tSDP_RECORD *p_rec, UINT16 start_attr, UINT16 end_attr);
+extern BOOLEAN SDP_AddAttributetoRecord (tSDP_RECORD *p_rec, UINT16 attr_id, UINT8 attr_type,
+                                  UINT32 attr_len, UINT8 *p_val);
+extern BOOLEAN SDP_AddProfileDescriptorListtoRecord (tSDP_RECORD *p_rec, UINT16 profile_uuid,
+                                      UINT16 version);
+extern BOOLEAN SDP_DeleteAttributefromRecord (tSDP_RECORD *p_rec, UINT16 attr_id);
 
 
 /* Functions provided by sdp_server.c