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

Commit a3307956 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use proper types tBTA_DM_SDP_RESULT::tSDP_RESULT" am: 6ccc70f5 am:... 

Merge "Use proper types tBTA_DM_SDP_RESULT::tSDP_RESULT" am: 6ccc70f5 am: fd0f3213 am: 916a2d78 am: 8672f7b0 am: 0cbd6a82

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



Change-Id: I3e61f5e815a973b170a9964991b2fb76ac6db4f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36f4ac2f 0cbd6a82

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -1793,7 +1793,7 @@ static void bta_dm_sdp_callback(tSDP_STATUS sdp_status) { 
      (tBTA_DM_SDP_RESULT*)osi_malloc(sizeof(tBTA_DM_SDP_RESULT));

      (tBTA_DM_SDP_RESULT*)osi_malloc(sizeof(tBTA_DM_SDP_RESULT));





  p_msg->hdr.event = BTA_DM_SDP_RESULT_EVT;

  p_msg->hdr.event = BTA_DM_SDP_RESULT_EVT;

  p_msg->sdp_result = static_cast<uint16_t>(sdp_status);

  p_msg->sdp_result = sdp_status;





  bta_sys_sendmsg(p_msg);

  bta_sys_sendmsg(p_msg);

}

}

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ typedef struct { 
/* data type for BTA_DM_SDP_RESULT_EVT */

/* data type for BTA_DM_SDP_RESULT_EVT */

typedef struct {

typedef struct {

  BT_HDR_RIGID hdr;

  BT_HDR_RIGID hdr;

  uint16_t sdp_result;

  tSDP_RESULT sdp_result;

} tBTA_DM_SDP_RESULT;

} tBTA_DM_SDP_RESULT;





typedef struct {

typedef struct {