Merge "AclManagerTest: Remove unused imports" (8587817f) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/cert/acl_manager_test.py

+0 −10

Original line number	Diff line number	Diff line
		@@ -14,19 +14,9 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		import os
		import sys
		import logging

		from cert.gd_base_test import GdBaseTestClass
		from cert.event_stream import EventStream
		from cert.truth import assertThat
		from google.protobuf import empty_pb2 as empty_proto
		from hci.facade import acl_manager_facade_pb2 as acl_manager_facade
		from neighbor.facade import facade_pb2 as neighbor_facade
		from hci.facade import controller_facade_pb2 as controller_facade
		from hci.facade import facade_pb2 as hci_facade
		import bluetooth_packets_python3 as bt_packets
		from bluetooth_packets_python3 import hci_packets
		from cert.py_hci import PyHci
		from cert.py_acl_manager import PyAclManager

system/gd/hci/facade/acl_manager_facade.cc

+6 −11

Original line number	Diff line number	Diff line
		@@ -253,7 +253,7 @@ class AclManagerFacadeService : public AclManagerFacade::Service, public Connect
		default:
		return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "Invalid command packet");
		}
		};
		}
		#undef GET_CONNECTION

		::grpc::Status FetchIncomingConnection(
		@@ -341,8 +341,7 @@ class AclManagerFacadeService : public AclManagerFacade::Service, public Connect
		acl_connections_.emplace(
		std::piecewise_construct,
		std::forward_as_tuple(handle),
		std::forward_as_tuple(
		handle, shared_connection, per_connection_events_[current_connection_request_], facade_handler_));
		std::forward_as_tuple(handle, shared_connection, per_connection_events_[current_connection_request_]));
		shared_connection->GetAclQueueEnd()->RegisterDequeue(
		facade_handler_,
		common::Bind(&AclManagerFacadeService::on_incoming_acl, common::Unretained(this), shared_connection, handle));
		@@ -371,12 +370,8 @@ class AclManagerFacadeService : public AclManagerFacade::Service, public Connect
		Connection(
		uint16_t handle,
		std::shared_ptr<ClassicAclConnection> connection,
		std::shared_ptr<::bluetooth::grpc::GrpcEventQueue<ConnectionEvent>> event_stream,
		os::Handler* facade_handler)
		: handle_(handle),
		connection_(std::move(connection)),
		event_stream_(event_stream),
		facade_handler_(facade_handler) {}
		std::shared_ptr<::bluetooth::grpc::GrpcEventQueue<ConnectionEvent>> event_stream)
		: handle_(handle), connection_(std::move(connection)), event_stream_(std::move(event_stream)) {}

		ConnectionManagementCallbacks* GetCallbacks() {
		return this;
		@@ -502,8 +497,8 @@ class AclManagerFacadeService : public AclManagerFacade::Service, public Connect
		uint16_t handle_;
		std::shared_ptr<ClassicAclConnection> connection_;
		std::shared_ptr<::bluetooth::grpc::GrpcEventQueue<ConnectionEvent>> event_stream_;
		::bluetooth::grpc::GrpcEventQueue<AclData> pending_acl_data_{"FetchAclData"};
		::bluetooth::os::Handler* facade_handler_;
		::bluetooth::grpc::GrpcEventQueue<AclData> pending_acl_data_{std::string("PendingAclData") +
		std::to_string(handle_)};
		};

		private: