Merge "Add shim for Security CreateBond method" (b9577ed3) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/shim/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ filegroup {
		"name.cc",
		"page.cc",
		"scanning.cc",
		"security.cc",
		"stack.cc",
		],
		}

system/gd/shim/isecurity.h

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#pragma once

		#include <cstdint>
		#include <functional>
		#include <string>

		/**
		* The gd API exported to the legacy api
		*/
		namespace bluetooth {
		namespace shim {

		struct ISecurity {
		virtual void CreateBond(std::string address) = 0;

		virtual ~ISecurity() {}
		};

		} // namespace shim
		} // namespace bluetooth

system/gd/shim/istack.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ struct IName;
		struct IL2cap;
		struct IPage;
		struct IScanning;
		struct ISecurity;

		struct IStack {
		virtual void Start() = 0;
		@@ -48,6 +49,7 @@ struct IStack {
		virtual IL2cap* GetL2cap() = 0;
		virtual IPage* GetPage() = 0;
		virtual IScanning* GetScanning() = 0;
		virtual ISecurity* GetSecurity() = 0;

		virtual ~IStack() {}
		};

system/gd/shim/only_include_this_file_into_legacy_stack___ever.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,4 +34,5 @@
		#include "gd/shim/iname.h"
		#include "gd/shim/ipage.h"
		#include "gd/shim/iscanning.h"
		#include "gd/shim/isecurity.h"
		#include "gd/shim/istack.h"

system/gd/shim/security.cc

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#define LOG_TAG "bt_gd_shim"

		#include "shim/security.h"

		#include <functional>
		#include <memory>

		#include "common/bind.h"
		#include "hci/address.h"
		#include "module.h"
		#include "os/handler.h"
		#include "os/log.h"
		#include "security/security_manager.h"
		#include "security/security_module.h"

		namespace bluetooth {
		namespace shim {

		struct Security::impl {
		void CreateBond(std::string address);

		os::Handler* Handler() /override/;

		impl(bluetooth::security::SecurityModule* security_module, os::Handler* handler);
		~impl();

		private:
		std::unique_ptr<bluetooth::security::SecurityManager> security_manager_{nullptr};
		os::Handler* handler_;
		};

		const ModuleFactory Security::Factory = ModuleFactory([]() { return new Security(); });

		Security::impl::impl(bluetooth::security::SecurityModule* security_module, os::Handler* handler)
		: security_manager_(security_module->GetSecurityManager()), handler_(handler) {}

		Security::impl::~impl() {}

		os::Handler* Security::impl::Handler() {
		return handler_;
		}

		void Security::impl::CreateBond(std::string address) {
		hci::Address bdaddr;
		if (!hci::Address::FromString(address, bdaddr)) {
		LOG_ERROR("%s bad address: %s, aborting", __func__, address.c_str());
		return;
		}

		security_manager_->CreateBond(hci::AddressWithType{bdaddr, hci::AddressType::PUBLIC_DEVICE_ADDRESS});
		}

		void Security::CreateBond(std::string address) {
		pimpl_->CreateBond(address);
		}

		/**
		* Module methods
		*/
		void Security::ListDependencies(ModuleList* list) {
		list->add<bluetooth::security::SecurityModule>();
		}

		void Security::Start() {
		pimpl_ = std::make_unique<impl>(GetDependency<bluetooth::security::SecurityModule>(), GetHandler());
		}

		void Security::Stop() {
		pimpl_.reset();
		}

		} // namespace shim
		} // namespace bluetooth