gd: add shim layer for LE scanning manager (1293129e) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_ble_scanner.cc

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,8 @@

	#include "btif_common.h"		#include "btif_common.h"
	#include "btif_util.h"		#include "btif_util.h"
			#include "main/shim/le_scanning_manager.h"
			#include "main/shim/shim.h"

	#include <hardware/bt_gatt.h>		#include <hardware/bt_gatt.h>

	@@ -338,8 +340,11 @@ BleScannerInterface* btLeScannerInstance = nullptr;
	} // namespace		} // namespace

	BleScannerInterface* get_ble_scanner_instance() {		BleScannerInterface* get_ble_scanner_instance() {
	if (btLeScannerInstance == nullptr)		if (bluetooth::shim::is_gd_scanning_enabled()) {
			LOG_INFO("Use gd le scanner");
			return bluetooth::shim::get_ble_scanner_instance();
			} else if (btLeScannerInstance == nullptr) {
	btLeScannerInstance = new BleScannerInterfaceImpl();		btLeScannerInstance = new BleScannerInterfaceImpl();
			}
	return btLeScannerInstance;		return btLeScannerInstance;
	}		}

system/main/shim/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@ filegroup {
	"hci_layer.cc",		"hci_layer.cc",
	"l2c_api.cc",		"l2c_api.cc",
	"le_advertising_manager.cc",		"le_advertising_manager.cc",
			"le_scanning_manager.cc",
	"shim.cc",		"shim.cc",
	"stack.cc",		"stack.cc",
	]		]

system/main/shim/le_scanning_manager.cc

0 → 100644

+116 −0

Original line number	Original line	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 "bt_shim_scanner"

			#include "le_scanning_manager.h"

			#include <base/bind.h>
			#include <base/threading/thread.h>

			#include <hardware/bluetooth.h>
			#include <stdio.h>
			#include <unordered_set>

			class BleScannerInterfaceImpl : public BleScannerInterface {
			public:
			~BleScannerInterfaceImpl() override{};

			/** Registers a scanner with the stack */
			void RegisterScanner(RegisterCallback) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/** Unregister a scanner from the stack */
			void Unregister(int scanner_id) { LOG(INFO) << __func__ << " in shim layer"; }

			/** Start or stop LE device scanning */
			void Scan(bool start) { LOG(INFO) << __func__ << " in shim layer"; }

			/** Setup scan filter params */
			void ScanFilterParamSetup(
			uint8_t client_if, uint8_t action, uint8_t filt_index,
			std::unique_ptr<btgatt_filt_param_setup_t> filt_param,
			FilterParamSetupCallback cb) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/** Configure a scan filter condition */
			void ScanFilterAdd(int filter_index, std::vector<ApcfCommand> filters,
			FilterConfigCallback cb) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/** Clear all scan filter conditions for specific filter index*/
			void ScanFilterClear(int filt_index, FilterConfigCallback cb) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/** Enable / disable scan filter feature*/
			void ScanFilterEnable(bool enable, EnableCallback cb) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/** Sets the LE scan interval and window in units of N0.625 msec /
			void SetScanParameters(int scan_interval, int scan_window, Callback cb) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/* Configure the batchscan storage */
			void BatchscanConfigStorage(int client_if, int batch_scan_full_max,
			int batch_scan_trunc_max,
			int batch_scan_notify_threshold, Callback cb) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/* Enable batchscan */
			virtual void BatchscanEnable(int scan_mode, int scan_interval,
			int scan_window, int addr_type, int discard_rule,
			Callback cb) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/* Disable batchscan */
			virtual void BatchscanDisable(Callback cb) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			/* Read out batchscan reports */
			void BatchscanReadReports(int client_if, int scan_mode) {
			LOG(INFO) << __func__ << " in shim layer";
			}

			void StartSync(uint8_t sid, RawAddress address, uint16_t skip,
			uint16_t timeout, StartSyncCb start_cb, SyncReportCb report_cb,
			SyncLostCb lost_cb) {
			LOG(INFO) << __func__ << " in shim layer";
			// This function doesn't implement in the old stack
			}

			void StopSync(uint16_t handle) {
			LOG(INFO) << __func__ << " in shim layer";
			// This function doesn't implement in the old stack
			}
			};

			BleScannerInterfaceImpl* bt_le_scanner_instance = nullptr;

			BleScannerInterface* bluetooth::shim::get_ble_scanner_instance() {
			if (bt_le_scanner_instance == nullptr) {
			bt_le_scanner_instance = new BleScannerInterfaceImpl();
			}
			return bt_le_scanner_instance;
			}
			No newline at end of file

system/main/shim/le_scanning_manager.h

0 → 100644

+31 −0

Original line number	Original line	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.
			*/

			/**
			* Gd shim layer to legacy le scanner
			*/
			#pragma once

			#include "include/hardware/ble_scanner.h"

			namespace bluetooth {
			namespace shim {

			BleScannerInterface* get_ble_scanner_instance();
			void init_scanning_manager();

			} // namespace shim
			} // namespace bluetooth
			No newline at end of file