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

Commit f95b9e00 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes I9821ba71,I065bf1d5,Ie55894fe,Icddbafa4 am: b5dde5bb 

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



Change-Id: I4b0ff8fc2ffea4ffa926218db00568416b6eb9f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c9e31c6 b5dde5bb

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientService.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ import java.util.UUID; 
 * @hide

 */

public class HeadsetClientService extends ProfileService {

    private static final boolean DBG = false;

    private static final boolean DBG = true;

    private static final String TAG = "HeadsetClientService";



    // This is also used as a lock for shared data in {@link HeadsetClientService}

system/stack/sdp/sdp_discovery.cc

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static bool sdp_copy_raw_data(tCONN_CB* p_ccb, bool offset) { 
  uint8_t* p_end;

  uint8_t type;



  if (p_ccb->p_db->raw_data) {

  if (p_ccb->p_db && p_ccb->p_db->raw_data) {

    cpy_len = p_ccb->p_db->raw_size - p_ccb->p_db->raw_used;

    list_len = p_ccb->list_len;

    p = &p_ccb->rsp_list[0];

system/test/mock/mock_bta_gatts_api.cc

+1 −0
Original line number Diff line number Diff line
@@ -85,3 +85,4 @@ void bta_gatts_add_service_impl(tGATT_IF server_if, 
                                BTA_GATTS_AddServiceCb cb) {

  mock_function_count_map[__func__]++;

}

void BTA_GATTS_InitBonded(void) { mock_function_count_map[__func__]++; }

system/test/mock/mock_stack_btm_dev.cc

+6 −0
Original line number Diff line number Diff line
@@ -112,3 +112,9 @@ void wipe_secrets_and_remove(tBTM_SEC_DEV_REC* p_dev_rec) { 
void btm_dev_consolidate_existing_connections(const RawAddress& bd_addr) {

  mock_function_count_map[__func__]++;

}

void BTM_SecDump(const std::string& label) {

  mock_function_count_map[__func__]++;

}

void BTM_SecDumpDev(const RawAddress& bd_addr) {

  mock_function_count_map[__func__]++;

}