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

Commit 052a10b7 authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

gd: Remove using directive from shim header file 

am: 09237317

Change-Id: I4c7c650eb6f341a7fb0b6777cc14def0937d56a9
parents a25d4d50 09237317

system/main/shim/stub/stack.cc

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

void TestGdShimL2cap::RegisterService(

    uint16_t psm, bool use_ertm, uint16_t mtu,

    uint16_t psm, bool use_ertm, uint16_t mtu,

    bluetooth::shim::ConnectionCompleteCallback on_complete,

    bluetooth::shim::ConnectionCompleteCallback on_complete,

    RegisterServicePending register_pending) {

    bluetooth::shim::RegisterServicePending register_pending) {

  register_pending.set_value(psm);

  register_pending.set_value(psm);

  registered_service_.insert(psm);

  registered_service_.insert(psm);

}

}





void TestGdShimL2cap::UnregisterService(

void TestGdShimL2cap::UnregisterService(

    uint16_t psm, UnregisterServicePending unregister_pending) {

    uint16_t psm,

    bluetooth::shim::UnregisterServicePending unregister_pending) {

  registered_service_.erase(psm);

  registered_service_.erase(psm);

  unregister_pending.set_value();

  unregister_pending.set_value();

}

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

void TestGdShimL2cap::CreateConnection(

    uint16_t psm, const std::string address,

    uint16_t psm, const std::string address,

    bluetooth::shim::ConnectionCompleteCallback on_complete,

    bluetooth::shim::ConnectionCompleteCallback on_complete,

    CreateConnectionPending create_pending) {

    bluetooth::shim::CreateConnectionPending create_pending) {

  create_pending.set_value(cid_);

  create_pending.set_value(cid_);

}

}

system/main/shim/stub/stack.h

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

#include "gd/shim/only_include_this_file_into_legacy_stack___ever.h"

#include "main/shim/entry.h"

#include "main/shim/entry.h"





using namespace bluetooth::shim;



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

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

 public:

 public:

  uint16_t cid_{0};

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

  size_t data_buffer_size_{0};

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

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





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

  void RegisterService(

                       ConnectionCompleteCallback on_complete,

      uint16_t psm, bool use_ertm, uint16_t mtu,

                       RegisterServicePending register_pending) override;

      bluetooth::shim::ConnectionCompleteCallback on_complete,

  void UnregisterService(uint16_t psm,

      bluetooth::shim::RegisterServicePending register_pending) override;

                         UnregisterServicePending unregister_pending) override;

  void UnregisterService(

      uint16_t psm,

      bluetooth::shim::UnregisterServicePending unregister_pending) override;





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

  void CreateConnection(

                        ConnectionCompleteCallback on_complete,

      uint16_t psm, const std::string address_string,

                        CreateConnectionPending create_pending) override;

      bluetooth::shim::ConnectionCompleteCallback on_complete,

      bluetooth::shim::CreateConnectionPending create_pending) override;





  void CloseConnection(uint16_t cid);

  void CloseConnection(uint16_t cid);

  void SetReadDataReadyCallback(

  void SetReadDataReadyCallback(