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

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

Merge "stack::sdp::tSDP_STATE Use proper type" into main am: 7e045318 

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



Change-Id: I9100fae86f745df8d0129d2e7a636a6c5d8d3ffd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50aff26e 7e045318

system/stack/sdp/sdpint.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ typedef uint8_t tSDP_DISC_WAIT; 


/* Define the SDP Connection Control Block */

struct tCONN_CB {

  uint8_t con_state;

  tSDP_STATE con_state;

  uint8_t con_flags;



  RawAddress device_address;

system/stack/test/sdp/stack_sdp_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ TEST_F(StackSdpInitTest, sdp_service_search_request) { 
  ASSERT_EQ(p_ccb->con_state, SDP_STATE_IDLE);

}



tCONN_CB* find_ccb(uint16_t cid, uint8_t state) {

tCONN_CB* find_ccb(uint16_t cid, tSDP_STATE state) {

  uint16_t xx;

  tCONN_CB* p_ccb;