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

Commit 3100c2f0 authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge "gd shim layer changes" 

am: a0615303

Change-Id: I80d3b5b4cc1c1ed10c250f4dc841fbd2b451efc1
parents 2482fa74 a0615303

system/gd/shim/il2cap.h

+3 −0
Original line number Diff line number Diff line
@@ -34,7 +34,10 @@ using ReadDataReadyCallback = std::function<void(uint16_t cid, std::vector<const 


struct IL2cap {

  virtual void RegisterService(uint16_t psm, ConnectionOpenCallback on_open, std::promise<void> completed) = 0;

  virtual void UnregisterService(uint16_t psm) = 0;



  virtual void CreateConnection(uint16_t psm, const std::string address, std::promise<uint16_t> completed) = 0;

  virtual void CloseConnection(uint16_t cid) = 0;



  virtual void SetReadDataReadyCallback(uint16_t cid, ReadDataReadyCallback on_data_ready) = 0;

  virtual void SetConnectionClosedCallback(uint16_t cid, ConnectionClosedCallback on_closed) = 0;

system/gd/shim/l2cap.cc

+192 −113

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/shim/l2cap.h

+3 −0
Original line number Diff line number Diff line
@@ -30,7 +30,10 @@ namespace shim { 
class L2cap : public bluetooth::Module, public bluetooth::shim::IL2cap {

 public:

  void RegisterService(uint16_t psm, ConnectionOpenCallback on_open, std::promise<void> completed) override;

  void UnregisterService(uint16_t psm) override;



  void CreateConnection(uint16_t psm, const std::string address, std::promise<uint16_t> completed) override;

  void CloseConnection(uint16_t cid) override;



  void SetReadDataReadyCallback(uint16_t cid, ReadDataReadyCallback on_data_ready) override;

  void SetConnectionClosedCallback(uint16_t cid, ConnectionClosedCallback on_closed) override;

system/main/shim/test_stack.cc

+4 −0
Original line number Diff line number Diff line
@@ -34,11 +34,15 @@ void TestGdShimL2cap::RegisterService( 
  completed.set_value();

}



void TestGdShimL2cap::UnregisterService(uint16_t psm) {}



void TestGdShimL2cap::CreateConnection(uint16_t psm, const std::string address,

                                       std::promise<uint16_t> completed) {

  completed.set_value(cid_);

}



void TestGdShimL2cap::CloseConnection(uint16_t cid) {}



void TestGdShimL2cap::SetReadDataReadyCallback(

    uint16_t cid, bluetooth::shim::ReadDataReadyCallback on_data_ready) {}

system/main/shim/test_stack.h

+2 −0
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ class TestGdShimL2cap : public bluetooth::shim::IL2cap { 
  void RegisterService(uint16_t psm,

                       bluetooth::shim::ConnectionOpenCallback on_open,

                       std::promise<void> completed) override;

  void UnregisterService(uint16_t psm);

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

                        std::promise<uint16_t> completed) override;

  void CloseConnection(uint16_t cid);

  void SetReadDataReadyCallback(

      uint16_t cid,

      bluetooth::shim::ReadDataReadyCallback on_data_ready) override;