system/gd: Remove sources for unimplemented module AttModule (e76084a8) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ cc_defaults {
		},
		},
		srcs: [
		":BluetoothAttSources",
		":BluetoothCommonSources",
		":BluetoothDumpsysSources",
		":BluetoothHalSources",

system/gd/BUILD.gn

+0 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@ static_library("libbluetooth_gd") {
		deps = [
		"//bt/system/gd/rust/topshim:libbluetooth_topshim",
		"//bt/system/gd/rust/shim:libbluetooth_rust_interop",
		"//bt/system/gd/att:BluetoothAttSources",
		"//bt/system/gd/common:BluetoothCommonSources",
		"//bt/system/gd/dumpsys:BluetoothDumpsysSources",
		"//bt/system/gd/hal:BluetoothHalSources",

system/gd/att/Android.bp

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "system_bt_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["system_bt_license"],
		}

		filegroup {
		name: "BluetoothAttSources",
		srcs: [
		"att_module.cc",
		],
		}

		filegroup {
		name: "BluetoothAttTestSources",
		srcs: [
		],
		}

system/gd/att/BUILD.gn

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		#
		# Copyright 2021 Google, Inc.
		#
		# 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.
		#

		source_set("BluetoothAttSources") {
		sources = [ "att_module.cc" ]

		configs += [ "//bt/system/gd:gd_defaults" ]
		deps = [ "//bt/system/gd:gd_default_deps" ]
		}

system/gd/att/att_module.cc

deleted100644 → 0

+0 −96

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 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 "att"

		#include "att/att_module.h"

		#include <bluetooth/log.h>

		#include <memory>

		#include "l2cap/classic/l2cap_classic_module.h"
		#include "l2cap/le/l2cap_le_module.h"
		#include "module.h"
		#include "os/handler.h"
		#include "os/log.h"

		namespace bluetooth {
		namespace att {

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

		namespace {
		void OnAttRegistrationCompleteLe(
		l2cap::le::FixedChannelManager::RegistrationResult /* result */,
		std::unique_ptr<l2cap::le::FixedChannelService> /* le_smp_service */) {
		log::info("ATT channel registration complete");
		}

		void OnAttConnectionOpenLe(std::unique_ptr<l2cap::le::FixedChannel> /* channel */) {
		log::info("ATT conneciton opened");
		}
		} // namespace

		struct AttModule::impl {
		impl(
		os::Handler* att_handler,
		l2cap::le::L2capLeModule* l2cap_le_module,
		l2cap::classic::L2capClassicModule* l2cap_classic_module)
		: att_handler_(att_handler), l2cap_le_module_(l2cap_le_module), l2cap_classic_module_(l2cap_classic_module) {
		// TODO: move that into a ATT manager, or other proper place
		std::unique_ptr<bluetooth::l2cap::le::FixedChannelManager> l2cap_manager_le_(
		l2cap_le_module_->GetFixedChannelManager());
		// TODO(b/161256497): CID 4 is taken by shim layer ATT module so far. When we migrate to GD ATT module, we use real
		// CID here.
		constexpr uint16_t kFakeLeAttributeCid = 50;
		l2cap_manager_le_->RegisterService(
		kFakeLeAttributeCid,
		common::BindOnce(&OnAttRegistrationCompleteLe),
		common::Bind(&OnAttConnectionOpenLe),
		att_handler_);
		}

		os::Handler* att_handler_;
		l2cap::le::L2capLeModule* l2cap_le_module_;
		l2cap::classic::L2capClassicModule* l2cap_classic_module_;
		};

		void AttModule::ListDependencies(ModuleList* list) const {
		list->add<l2cap::le::L2capLeModule>();
		list->add<l2cap::classic::L2capClassicModule>();
		}

		void AttModule::Start() {
		pimpl_ = std::make_unique<impl>(
		GetHandler(), GetDependency<l2cap::le::L2capLeModule>(), GetDependency<l2cap::classic::L2capClassicModule>());
		}

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

		std::string AttModule::ToString() const {
		return "Att Module";
		}

		// std::unique_ptr<AttManager> AttModule::GetAttManager() {
		// return std::unique_ptr<AttManager>(
		// new AttManager(pimpl_->att_handler_, &pimpl_->att_manager_impl));
		// }

		} // namespace att
		} // namespace bluetooth