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

Commit 5206fbe3 authored by Prerepa Viswanadham's avatar Prerepa Viswanadham
Browse files

Fix build error in bluedroid 

Change-Id: I6bcf655540f13db578948ac8eddde971637ed26b
parent ac1f78d3

system/bta/dm/bta_dm_api.c

+2 −1
Original line number Diff line number Diff line
@@ -1822,14 +1822,15 @@ static void bta_dm_discover_send_msg(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_s 


        if (p_services != NULL)

        {

#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE

            p_msg->services = p_services->srvc_mask;

            p_msg->num_uuid = p_services->num_uuid;



            if (p_services->num_uuid != 0)

            {

                p_msg->p_uuid = (tBT_UUID *)(p_msg + 1);

                memcpy(p_msg->p_uuid, p_services->p_uuid, sizeof(tBT_UUID) * p_services->num_uuid);

            }

#endif

        }



        bta_sys_sendmsg(p_msg);

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -924,8 +924,8 @@ typedef struct 
    tBTA_DM_BLE_PF_STATUS_CBACK  *p_scan_filt_status_cback;

    tBTA_DM_BLE_PF_PARAM_CBACK   *p_scan_filt_param_cback;

    tBTA_BLE_MULTI_ADV_CBACK     *p_multi_adv_cback;

#endif

    tBTA_BLE_ENERGY_INFO_CBACK   *p_energy_info_cback;

#endif

    TIMER_LIST_ENT              signal_strength_timer;

    tBTA_SIG_STRENGTH_MASK      signal_strength_mask;

    UINT16                      state;

system/bta/dm/bta_dm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ const tBTA_DM_ACTION bta_dm_action[] = 
    bta_dm_ble_disable_batch_scan, /* BTA_DM_API_BLE_DISABLE_BATCH_SCAN_EVT */

    bta_dm_ble_read_scan_reports,  /* BTA_DM_API_BLE_READ_SCAN_REPORTS_EVT */

    bta_dm_ble_track_advertiser,   /* BTA_DM_API_BLE_TRACK_ADVERTISER_EVT */

#endif

    bta_dm_ble_get_energy_info,    /* BTA_DM_API_BLE_ENERGY_INFO_EVT */

#endif



#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)

    bta_dm_update_eir_uuid,     /*  BTA_DM_API_UPDATE_EIR_UUID_EVT      */

system/vnd/ble/vendor_ble.c

+1 −2
Original line number Diff line number Diff line
@@ -657,7 +657,6 @@ tBTM_STATUS btm_ble_vendor_enable_irk_feature(BOOLEAN enable) 
    return BTM_MODE_UNSUPPORTED;

}



#endif



/*******************************************************************************

**
@@ -723,5 +722,5 @@ void btm_ble_vendor_cleanup(void) 
    memset(&btm_ble_vendor_cb, 0, sizeof(tBTM_BLE_VENDOR_CB));

}





#endif