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

Commit 6d18ac7a authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "shim: Add method to query stack manager for gd dumpsys module start"... 

Merge "shim: Add method to query stack manager for gd dumpsys module start" am: d5912836 am: 9d36e897 am: a75cdc38

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1682668

Change-Id: Iae4b1aff90b4d80b6284f87264b5292125763d7d
parents d2b51cdb a75cdc38

system/main/shim/stack.cc

+11 −0
Original line number Diff line number Diff line
@@ -232,6 +232,12 @@ StackManager* Stack::GetStackManager() { 
  return &stack_manager_;

}



const StackManager* Stack::GetStackManager() const {

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

  ASSERT(is_running_);

  return &stack_manager_;

}



legacy::Acl* Stack::GetAcl() {

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

  ASSERT(is_running_);
@@ -258,5 +264,10 @@ os::Handler* Stack::GetHandler() { 
  return stack_handler_;

}



bool Stack::IsDumpsysModuleStarted() const {

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

  return GetStackManager()->IsStarted<Dumpsys>();

}



}  // namespace shim

}  // namespace bluetooth

system/main/shim/stack.h

+4 −1
Original line number Diff line number Diff line
@@ -48,8 +48,11 @@ class Stack { 


  void Stop();

  bool IsRunning();

  bool IsDumpsysModuleStarted() const;



  StackManager* GetStackManager();

  const StackManager* GetStackManager() const;



  legacy::Acl* GetAcl();

  LinkPolicyInterface* LinkPolicy();
@@ -64,7 +67,7 @@ class Stack { 
  DISALLOW_COPY_AND_ASSIGN(Stack);



 private:

  std::recursive_mutex mutex_;

  mutable std::recursive_mutex mutex_;

  StackManager stack_manager_;

  bool is_running_ = false;

  os::Thread* stack_thread_ = nullptr;