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

Commit ac4922a2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6953012 from 7c320180 to sc-release 

Change-Id: Id5d007b046ea20f1d41ec14b9e85da6b76674dd9
parents 41025a8e 7c320180

system/stack/acl/btm_acl.cc

+0 −2
Original line number Diff line number Diff line
@@ -838,8 +838,6 @@ void btm_process_remote_ext_features(tACL_CONN* p_acl_cb, 
    return;

  }



  p_dev_rec->num_read_pages = num_read_pages;



  p_dev_rec->remote_supports_hci_role_switch =

      HCI_SWITCH_SUPPORTED(p_acl_cb->peer_lmp_feature_pages[0]);

system/stack/btm/btm_dev.cc

+0 −2
Original line number Diff line number Diff line
@@ -99,8 +99,6 @@ bool BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class, 
            BTM_MAX_REM_BD_NAME_LEN + 1);

  }



  p_dev_rec->num_read_pages = 0;



  if (p_link_key) {

    VLOG(2) << __func__ << ": BDA: " << bd_addr;

    p_dev_rec->sec_flags |= BTM_SEC_LINK_KEY_KNOWN;

system/stack/btm/btm_sec.cc

+1 −2
Original line number Diff line number Diff line
@@ -2427,8 +2427,7 @@ void btm_io_capabilities_req(const RawAddress& p) { 
  BTM_TRACE_EVENT("%s: State: %s", __func__,

                  btm_pair_state_descr(btm_cb.pairing_state));



  BTM_TRACE_DEBUG("%s:Security mode: %d, Num Read Remote Feat pages: %d",

                  __func__, btm_cb.security_mode, p_dev_rec->num_read_pages);

  BTM_TRACE_DEBUG("%s:Security mode: %d", __func__, btm_cb.security_mode);



  p_dev_rec->sm4 |= BTM_SM4_TRUE;

system/stack/btm/security_device_record.h

+0 −1
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ typedef struct { 


  tBTM_BD_NAME sec_bd_name; /* User friendly name of the device. (may be

                               truncated to save space in dev_rec table) */

  uint8_t num_read_pages;



  uint8_t sec_state;          /* Operating state                    */

  bool is_security_state_idle() const {

system/stack/gatt/gatt_attr.cc

+0 −3
Original line number Diff line number Diff line
@@ -577,11 +577,8 @@ static void gatt_cl_op_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op, 
      }



      /* Notify user if eatt is supported */

#if 0

      bool eatt_supported =

          supported_feat_mask & BLE_GATT_SVR_SUP_FEAT_EATT_BITMASK;

#endif

      bool eatt_supported = false;  // TODO Requires passing more tests

      gatt_attr_send_is_eatt_cb(conn_id, operation_callback_data,

                                eatt_supported);