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

Commit f1d14b92 authored by Alice Kuo's avatar Alice Kuo Committed by Automerger Merge Worker
Browse files

csis: minor cleanup for the RSI type define am: 1e51448f 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1832272

Change-Id: Idf04e5a74c8182204198b3c29618eaff205350cf
parents 16975535 1e51448f

system/bta/csis/csis_client.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -988,7 +988,7 @@ class CsisClientImpl : public CsisClient { 




    while ((p_service_data = AdvertiseDataParser::GetFieldByType(

    while ((p_service_data = AdvertiseDataParser::GetFieldByType(

                p_service_data + service_data_len,

                p_service_data + service_data_len,

                (remaining_data_len -= service_data_len), BTM_EIR_RSI_TYPE,

                (remaining_data_len -= service_data_len), BTM_BLE_AD_TYPE_RSI,

                &service_data_len))) {

                &service_data_len))) {

      uint8_t* p = (uint8_t*)(p_service_data);

      uint8_t* p = (uint8_t*)(p_service_data);

      RawAddress bda;

      RawAddress bda;

system/stack/include/btm_api_types.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -250,9 +250,6 @@ enum { 




typedef uint8_t tBTM_EIR_SEARCH_RESULT;

typedef uint8_t tBTM_EIR_SEARCH_RESULT;





/* 0x2C */

#define BTM_EIR_RSI_TYPE HCI_EIR_RSI_TYPE



typedef enum : uint8_t {

typedef enum : uint8_t {

  BTM_BLE_SEC_NONE = 0,

  BTM_BLE_SEC_NONE = 0,

  /* encrypt the link using current key */

  /* encrypt the link using current key */