Merge "shim: Add method to query stack manager for gd dumpsys module start" (d5912836) · Commits · e / os / android_packages_modules_Bluetooth

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

+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;