Loading system/main/shim/btm.cc +0 −14 Original line number Original line Diff line number Diff line Loading @@ -419,20 +419,6 @@ BtmStatus Btm::ReadClassicRemoteDeviceName(const RawAddress& raw_address, return BTM_UNDEFINED; return BTM_UNDEFINED; } } BtmStatus Btm::ReadLeRemoteDeviceName(const RawAddress& raw_address, tBTM_NAME_CMPL_CB* callback) { if (!CheckLeAclLink(raw_address)) { return BTM_UNKNOWN_ADDR; } if (!le_read_remote_name_.Start(raw_address)) { return BTM_BUSY; } LOG_INFO("UNIMPLEMENTED %s need access to GATT module", __func__); return BTM_UNKNOWN_ADDR; } BtmStatus Btm::CancelAllReadRemoteDeviceName() { BtmStatus Btm::CancelAllReadRemoteDeviceName() { LOG_ALWAYS_FATAL("unreachable"); LOG_ALWAYS_FATAL("unreachable"); return BTM_UNDEFINED; return BTM_UNDEFINED; Loading system/main/shim/btm.h +1 −7 Original line number Original line Diff line number Diff line Loading @@ -138,8 +138,6 @@ class Btm { // Remote device name API // Remote device name API BtmStatus ReadClassicRemoteDeviceName(const RawAddress& raw_address, BtmStatus ReadClassicRemoteDeviceName(const RawAddress& raw_address, tBTM_NAME_CMPL_CB* callback); tBTM_NAME_CMPL_CB* callback); BtmStatus ReadLeRemoteDeviceName(const RawAddress& raw_address, tBTM_NAME_CMPL_CB* callback); BtmStatus CancelAllReadRemoteDeviceName(); BtmStatus CancelAllReadRemoteDeviceName(); // Le neighbor interaction API // Le neighbor interaction API Loading Loading @@ -238,11 +236,7 @@ class Btm { void OnBigInfoReport(uint16_t sync_handle, bool encrypted) override; void OnBigInfoReport(uint16_t sync_handle, bool encrypted) override; }; }; ScanningCallbacks scanning_callbacks_; ScanningCallbacks scanning_callbacks_; void StartScanning(bool /* use_active_scanning */); // TODO(cmanton) abort if there is no classic acl link up bool CheckClassicAclLink(const RawAddress& raw_address) { return true; } bool CheckLeAclLink(const RawAddress& raw_address) { return true; } void StartScanning(bool use_active_scanning); }; }; } // namespace shim } // namespace shim Loading Loading
system/main/shim/btm.cc +0 −14 Original line number Original line Diff line number Diff line Loading @@ -419,20 +419,6 @@ BtmStatus Btm::ReadClassicRemoteDeviceName(const RawAddress& raw_address, return BTM_UNDEFINED; return BTM_UNDEFINED; } } BtmStatus Btm::ReadLeRemoteDeviceName(const RawAddress& raw_address, tBTM_NAME_CMPL_CB* callback) { if (!CheckLeAclLink(raw_address)) { return BTM_UNKNOWN_ADDR; } if (!le_read_remote_name_.Start(raw_address)) { return BTM_BUSY; } LOG_INFO("UNIMPLEMENTED %s need access to GATT module", __func__); return BTM_UNKNOWN_ADDR; } BtmStatus Btm::CancelAllReadRemoteDeviceName() { BtmStatus Btm::CancelAllReadRemoteDeviceName() { LOG_ALWAYS_FATAL("unreachable"); LOG_ALWAYS_FATAL("unreachable"); return BTM_UNDEFINED; return BTM_UNDEFINED; Loading
system/main/shim/btm.h +1 −7 Original line number Original line Diff line number Diff line Loading @@ -138,8 +138,6 @@ class Btm { // Remote device name API // Remote device name API BtmStatus ReadClassicRemoteDeviceName(const RawAddress& raw_address, BtmStatus ReadClassicRemoteDeviceName(const RawAddress& raw_address, tBTM_NAME_CMPL_CB* callback); tBTM_NAME_CMPL_CB* callback); BtmStatus ReadLeRemoteDeviceName(const RawAddress& raw_address, tBTM_NAME_CMPL_CB* callback); BtmStatus CancelAllReadRemoteDeviceName(); BtmStatus CancelAllReadRemoteDeviceName(); // Le neighbor interaction API // Le neighbor interaction API Loading Loading @@ -238,11 +236,7 @@ class Btm { void OnBigInfoReport(uint16_t sync_handle, bool encrypted) override; void OnBigInfoReport(uint16_t sync_handle, bool encrypted) override; }; }; ScanningCallbacks scanning_callbacks_; ScanningCallbacks scanning_callbacks_; void StartScanning(bool /* use_active_scanning */); // TODO(cmanton) abort if there is no classic acl link up bool CheckClassicAclLink(const RawAddress& raw_address) { return true; } bool CheckLeAclLink(const RawAddress& raw_address) { return true; } void StartScanning(bool use_active_scanning); }; }; } // namespace shim } // namespace shim Loading