diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-06 18:04:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-06 18:04:18 +0000 |
| commit | 8672f7b0f82b084476112800e7ba14e77d788f90 (patch) | |
| tree | 4e8aedf6cabd71544dfd0f34535996bec7641b27 | |
| parent | 3be674383d1af94dda0f532f2de075551a8a18b5 (diff) | |
| parent | 916a2d78511661ab261e9a5379287895f3ee0f47 (diff) | |
Merge "Use proper types tBTA_DM_SDP_RESULT::tSDP_RESULT" am: 6ccc70f555 am: fd0f3213f4 am: 916a2d7851
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2056571
Change-Id: Ifeead76b19bc12c14057e2b5ee5e9802b152128f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/bta/dm/bta_dm_act.cc | 2 | ||||
| -rw-r--r-- | system/bta/dm/bta_dm_int.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc index ba90f8a720..35c528a56a 100644 --- a/system/bta/dm/bta_dm_act.cc +++ b/system/bta/dm/bta_dm_act.cc @@ -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)); 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); } diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h index 637c22aef9..fc5b9bc2d5 100644 --- a/system/bta/dm/bta_dm_int.h +++ b/system/bta/dm/bta_dm_int.h @@ -133,7 +133,7 @@ typedef struct { /* data type for BTA_DM_SDP_RESULT_EVT */ typedef struct { BT_HDR_RIGID hdr; - uint16_t sdp_result; + tSDP_RESULT sdp_result; } tBTA_DM_SDP_RESULT; typedef struct { |