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

Commit df415087 authored by Chris Manton's avatar Chris Manton
Browse files

shim: Remove unused link policy interface 

Bug: 331465634
Test: m .
Flag: EXEMPT, Code Removal

Change-Id: I9019b4d5f94be16e4d782a62e8d06e8c2d34d127
parent bf2c8c2a

system/main/shim/acl.cc

+0 −30
Original line number Diff line number Diff line
@@ -1798,36 +1798,6 @@ void shim::legacy::Acl::UpdateConnectionParameters( 
                   conn_timeout, min_ce_len, max_ce_len);

}



bool shim::legacy::Acl::HoldMode(uint16_t hci_handle, uint16_t max_interval,

                                 uint16_t min_interval) {

  handler_->CallOn(pimpl_.get(), &Acl::impl::HoldMode, hci_handle, max_interval,

                   min_interval);

  return false;  // TODO void

}



bool shim::legacy::Acl::SniffMode(uint16_t hci_handle, uint16_t max_interval,

                                  uint16_t min_interval, uint16_t attempt,

                                  uint16_t timeout) {

  handler_->CallOn(pimpl_.get(), &Acl::impl::SniffMode, hci_handle,

                   max_interval, min_interval, attempt, timeout);

  return false;

}



bool shim::legacy::Acl::ExitSniffMode(uint16_t hci_handle) {

  handler_->CallOn(pimpl_.get(), &Acl::impl::ExitSniffMode, hci_handle);

  return false;

}



bool shim::legacy::Acl::SniffSubrating(uint16_t hci_handle,

                                       uint16_t maximum_latency,

                                       uint16_t minimum_remote_timeout,

                                       uint16_t minimum_local_timeout) {

  handler_->CallOn(pimpl_.get(), &Acl::impl::SniffSubrating, hci_handle,

                   maximum_latency, minimum_remote_timeout,

                   minimum_local_timeout);

  return false;

}



void shim::legacy::Acl::LeSetDefaultSubrate(uint16_t subrate_min,

                                            uint16_t subrate_max,

                                            uint16_t max_latency,

system/main/shim/acl.h

+1 −13
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "hci/class_of_device.h"

#include "main/shim/acl_legacy_interface.h"

#include "main/shim/link_connection_interface.h"

#include "main/shim/link_policy_interface.h"

#include "os/handler.h"

#include "packet/raw_builder.h"

#include "types/raw_address.h"
@@ -37,8 +36,7 @@ namespace legacy { 


class Acl : public hci::acl_manager::ConnectionCallbacks,

            public hci::acl_manager::LeConnectionCallbacks,

            public LinkConnectionInterface,

            public LinkPolicyInterface {

            public LinkConnectionInterface {

 public:

  Acl(os::Handler* handler, const acl_interface_t& acl_interface,

      uint8_t max_acceptlist_size, uint8_t max_address_resolution_size);
@@ -95,16 +93,6 @@ class Acl : public hci::acl_manager::ConnectionCallbacks, 
      const hci::AddressWithType& address_with_type);

  void ClearAddressResolution();



  // LinkPolicyInterface

  bool HoldMode(uint16_t hci_handle, uint16_t max_interval,

                uint16_t min_interval) override;

  bool SniffMode(uint16_t hci_handle, uint16_t max_interval,

                 uint16_t min_interval, uint16_t attempt,

                 uint16_t timeout) override;

  bool ExitSniffMode(uint16_t hci_handle) override;

  bool SniffSubrating(uint16_t hci_handle, uint16_t maximum_latency,

                      uint16_t minimum_remote_timeout,

                      uint16_t minimum_local_timeout) override;

  void LeSetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max,

                           uint16_t max_latency, uint16_t cont_num,

                           uint16_t sup_tout);

system/main/shim/link_policy_interface.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <cstdint>



namespace bluetooth {

namespace shim {



class LinkPolicyInterface {

 public:

  virtual bool HoldMode(uint16_t handle, uint16_t max_interval,

                        uint16_t min_interval) = 0;

  virtual bool SniffMode(uint16_t handle, uint16_t max_interval,

                         uint16_t min_interval, uint16_t attempt,

                         uint16_t timeout) = 0;

  virtual bool ExitSniffMode(uint16_t handle) = 0;

  virtual bool SniffSubrating(uint16_t handle, uint16_t maximum_latency,

                              uint16_t minimum_remote_timeout,

                              uint16_t minimum_local_timeout) = 0;

  virtual ~LinkPolicyInterface() = default;

};



}  // namespace shim

}  // namespace bluetooth

system/main/shim/stack.cc

+0 −7
Original line number Diff line number Diff line
@@ -194,13 +194,6 @@ legacy::Acl* Stack::GetAcl() { 
  return pimpl_->acl_;

}



LinkPolicyInterface* Stack::LinkPolicy() {

  std::lock_guard<std::recursive_mutex> lock(mutex_);

  ASSERT(is_running_);

  ASSERT_LOG(pimpl_->acl_ != nullptr, "Acl shim layer has not been created");

  return pimpl_->acl_;

}



Btm* Stack::GetBtm() {

  std::lock_guard<std::recursive_mutex> lock(mutex_);

  ASSERT(is_running_);

system/main/shim/stack.h

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <functional>

#include <mutex>



#include "main/shim/link_policy_interface.h"

#include "module.h"

#include "os/handler.h"

#include "os/thread.h"
@@ -57,7 +56,6 @@ class Stack { 
  const StackManager* GetStackManager() const;



  legacy::Acl* GetAcl();

  LinkPolicyInterface* LinkPolicy();



  Btm* GetBtm();

  os::Handler* GetHandler();