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

Commit a5a0a8a5 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android (Google) Code Review
Browse files

Merge "Do not deregister HH GATT IF in bta_gattc_disable for hid over GATT" into klp-dev

parents 3863ce88 496dce43

system/bta/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ LOCAL_C_INCLUDES+= . \ 
                   $(LOCAL_PATH)/include \

                   $(LOCAL_PATH)/sys \

                   $(LOCAL_PATH)/dm \

                   $(LOCAL_PATH)/hh \

                   $(LOCAL_PATH)/../gki/common \

                   $(LOCAL_PATH)/../gki/ulinux \

                   $(LOCAL_PATH)/../include \

system/bta/gatt/bta_gattc_act.c

+12 −1
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
#include "bta_gattc_int.h"

#include "l2c_api.h"



#if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)

#include "bta_hh_int.h"

#endif



#include <string.h>
@@ -137,7 +140,15 @@ void bta_gattc_disable(tBTA_GATTC_CB *p_cb) 
        if (p_cb->cl_rcb[i].in_use)

        {

            p_cb->state = BTA_GATTC_STATE_DISABLING;

            /* don't deregister HH GATT IF */

            /* HH GATT IF will be deregistered by bta_hh_le_deregister when disable HH */

#if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)

            if (!bta_hh_le_is_hh_gatt_if(p_cb->cl_rcb[i].client_if)) {

#endif

                bta_gattc_deregister(p_cb, &p_cb->cl_rcb[i]);

#if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)

            }

#endif

        }

    }

system/bta/hh/bta_hh_int.h

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ extern tBTA_HH_STATUS bta_hh_read_ssr_param(BD_ADDR bd_addr, UINT16 *p_max_ssr_l 


/* functions for LE HID */

extern void bta_hh_le_enable(void);

extern BOOLEAN bta_hh_le_is_hh_gatt_if(tBTA_GATTC_IF client_if);

extern void bta_hh_le_deregister(void);

extern BOOLEAN bta_hh_is_le_device(tBTA_HH_DEV_CB *p_cb, BD_ADDR remote_bda);

extern void bta_hh_le_open_conn(tBTA_HH_DEV_CB *p_cb, BD_ADDR remote_bda);

system/bta/hh/bta_hh_le.c

+15 −0
Original line number Diff line number Diff line
@@ -236,6 +236,21 @@ void bta_hh_le_register_cmpl(tBTA_GATTC_REG *p_reg) 
    (* bta_hh_cb.p_cback)(BTA_HH_ENABLE_EVT, (tBTA_HH *)&status);

}



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

**

** Function         bta_hh_le_is_hh_gatt_if

**

** Description      Check to see if client_if is BTA HH LE GATT interface

**

**

** Returns          whether it is HH GATT IF

**

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

BOOLEAN bta_hh_le_is_hh_gatt_if(tBTA_GATTC_IF client_if)

{

    return (bta_hh_cb.gatt_if == client_if);

}



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

**

** Function         bta_hh_le_deregister