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

Commit b311821d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

gd: Remove using directive from shim header file am: 09237317 am: 052a10b7 

Change-Id: I62da94241392ee667332d00e46f5fe3785074efe
parents a10ec0b5 052a10b7

system/main/shim/stub/stack.cc

+4 −3
Original line number Diff line number Diff line
@@ -37,13 +37,14 @@ bluetooth::shim::IStack* bluetooth::shim::GetGabeldorscheStack() { 
void TestGdShimL2cap::RegisterService(

    uint16_t psm, bool use_ertm, uint16_t mtu,

    bluetooth::shim::ConnectionCompleteCallback on_complete,

    RegisterServicePending register_pending) {

    bluetooth::shim::RegisterServicePending register_pending) {

  register_pending.set_value(psm);

  registered_service_.insert(psm);

}



void TestGdShimL2cap::UnregisterService(

    uint16_t psm, UnregisterServicePending unregister_pending) {

    uint16_t psm,

    bluetooth::shim::UnregisterServicePending unregister_pending) {

  registered_service_.erase(psm);

  unregister_pending.set_value();

}
@@ -51,7 +52,7 @@ void TestGdShimL2cap::UnregisterService( 
void TestGdShimL2cap::CreateConnection(

    uint16_t psm, const std::string address,

    bluetooth::shim::ConnectionCompleteCallback on_complete,

    CreateConnectionPending create_pending) {

    bluetooth::shim::CreateConnectionPending create_pending) {

  create_pending.set_value(cid_);

}

system/main/shim/stub/stack.h

+11 −10
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include "gd/shim/only_include_this_file_into_legacy_stack___ever.h"

#include "main/shim/entry.h"



using namespace bluetooth::shim;



class TestGdShimL2cap : public bluetooth::shim::IL2cap {

 public:

  uint16_t cid_{0};
@@ -30,15 +28,18 @@ class TestGdShimL2cap : public bluetooth::shim::IL2cap { 
  size_t data_buffer_size_{0};

  std::set<uint16_t /* psm */> registered_service_;



  void RegisterService(uint16_t psm, bool use_ertm, uint16_t mtu,

                       ConnectionCompleteCallback on_complete,

                       RegisterServicePending register_pending) override;

  void UnregisterService(uint16_t psm,

                         UnregisterServicePending unregister_pending) override;

  void RegisterService(

      uint16_t psm, bool use_ertm, uint16_t mtu,

      bluetooth::shim::ConnectionCompleteCallback on_complete,

      bluetooth::shim::RegisterServicePending register_pending) override;

  void UnregisterService(

      uint16_t psm,

      bluetooth::shim::UnregisterServicePending unregister_pending) override;



  void CreateConnection(uint16_t psm, const std::string address_string,

                        ConnectionCompleteCallback on_complete,

                        CreateConnectionPending create_pending) override;

  void CreateConnection(

      uint16_t psm, const std::string address_string,

      bluetooth::shim::ConnectionCompleteCallback on_complete,

      bluetooth::shim::CreateConnectionPending create_pending) override;



  void CloseConnection(uint16_t cid);

  void SetReadDataReadyCallback(