Snap for 7107824 from 12aa0c4164b67d32f48d370b5f96c92c65bc20c4 to sc-release (1c15e68a) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/cert/run

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -54,8 +54,14 @@ function check_environment {
	echo		echo
	exit 1		exit 1
	fi		fi
	if ! [ -x "$(command -v python3.8)" ] ; then		if ! [ -x "$(command -v python3.9)" ] ; then
	echo -e "${RED}You must have python 3.8 installed${NOCOLOR}"		echo -e "${RED}You must have python 3.9 installed${NOCOLOR}"
			exit 1
			fi
			python3.9 -m virtualenv --version
			if [[ $? -ne 0 ]] ; then
			echo "${RED}virtualenv not installed for python3.9${NOCOLOR}"
			echo "${RED}Please run 'python3.9 -m pip install virtualenv' to install it${NOCOLOR}"
	exit 1		exit 1
	fi		fi
	}		}
	@@ -265,7 +271,7 @@ function setup_venv {
	echo -e "${NOCOLOR}"		echo -e "${NOCOLOR}"
	fi		fi
	fi		fi
	python3.8 -m virtualenv --python `which python3.8` "${CERT_TEST_VENV}"		python3.9 -m virtualenv --python `which python3.9` "${CERT_TEST_VENV}"
	if [[ $? -ne 0 ]] ; then		if [[ $? -ne 0 ]] ; then
	echo "Error setting up virtualenv"		echo "Error setting up virtualenv"
	exit 1		exit 1

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -196,7 +196,6 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb
	if (advertising_sets_.count(advertiser_id) == 0) {		if (advertising_sets_.count(advertiser_id) == 0) {
	return;		return;
	}		}
	advertising_sets_.erase(advertiser_id);
	if (advertising_sets_.empty() && address_manager_registered) {		if (advertising_sets_.empty() && address_manager_registered) {
	le_address_manager_->Unregister(this);		le_address_manager_->Unregister(this);
	address_manager_registered = false;		address_manager_registered = false;
	@@ -212,6 +211,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb
	advertising_sets_[advertiser_id].address_rotation_alarm.reset();		advertising_sets_[advertiser_id].address_rotation_alarm.reset();
	}		}
	}		}
			advertising_sets_.erase(advertiser_id);
	}		}

	void create_advertiser(		void create_advertiser(

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -74,9 +74,9 @@ class InstallLocalPackagesForInstallation(install):
	if self.reuse_acts and is_acts_importable():		if self.reuse_acts and is_acts_importable():
	self.announce('Reusing existing ACTS installation', log.WARN)		self.announce('Reusing existing ACTS installation', log.WARN)
	else:		else:
	self.announce('Installing ACTS for installation', log.WARN)		self.announce('Installing ACTS library', log.WARN)
	setup_acts_for_cmd_or_die("install")		setup_acts_for_cmd_or_die("install")
	self.announce('ACTS installed for installation.', log.WARN)		self.announce('ACTS installed.', log.WARN)
	if not is_acts_importable():		if not is_acts_importable():
	raise DistutilsModuleError("Cannot import acts after installation")		raise DistutilsModuleError("Cannot import acts after installation")
	install.run(self)		install.run(self)

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,14 @@
	#include "gd/hci/le_scanning_manager.h"		#include "gd/hci/le_scanning_manager.h"
	#include "main/shim/entry.h"		#include "main/shim/entry.h"

			#include "stack/btm/btm_int_types.h"

			extern void btm_ble_process_adv_pkt_cont_for_inquiry(
			uint16_t event_type, uint8_t address_type, const RawAddress& raw_address,
			uint8_t primary_phy, uint8_t secondary_phy, uint8_t advertising_sid,
			int8_t tx_power, int8_t rssi, uint16_t periodic_adv_int,
			std::vector<uint8_t> advertising_data);

	class BleScannerInterfaceImpl : public BleScannerInterface,		class BleScannerInterfaceImpl : public BleScannerInterface,
	public bluetooth::hci::ScanningCallback {		public bluetooth::hci::ScanningCallback {
	public:		public:
	@@ -209,6 +217,12 @@ class BleScannerInterfaceImpl : public BleScannerInterface,
	address_type, raw_address, primary_phy, secondary_phy,		address_type, raw_address, primary_phy, secondary_phy,
	advertising_sid, tx_power, rssi,		advertising_sid, tx_power, rssi,
	periodic_advertising_interval, advertising_data));		periodic_advertising_interval, advertising_data));

			// TODO: Remove when StartInquiry in GD part implemented
			btm_ble_process_adv_pkt_cont_for_inquiry(
			event_type, address_type, raw_address, primary_phy, secondary_phy,
			advertising_sid, tx_power, rssi, periodic_advertising_interval,
			advertising_data);
	}		}

	void OnTrackAdvFoundLost() {}		void OnTrackAdvFoundLost() {}

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@
	#include "hcimsgs.h"		#include "hcimsgs.h"

	#include "btm_ble_int.h"		#include "btm_ble_int.h"
			#include "main/shim/shim.h"
	#include "stack/btm/btm_dev.h"		#include "stack/btm/btm_dev.h"
	#include "stack/crypto_toolbox/crypto_toolbox.h"		#include "stack/crypto_toolbox/crypto_toolbox.h"
	#include "stack/include/acl_api.h"		#include "stack/include/acl_api.h"
	@@ -72,6 +73,14 @@ static void btm_ble_refresh_raddr_timer_timeout(UNUSED_ATTR void* data) {
	/** This function is called when random address for local controller was		/** This function is called when random address for local controller was
	* generated */		* generated */
	void btm_gen_resolve_paddr_low(const RawAddress& address) {		void btm_gen_resolve_paddr_low(const RawAddress& address) {
			/* when GD advertising and scanning modules are enabled, set random address
			* via address manager in GD */
			if (bluetooth::shim::is_gd_advertising_enabled() &&
			bluetooth::shim::is_gd_scanning_enabled()) {
			LOG_INFO("GD advertising and scanning modules are enabled, skip");
			return;
			}

	tBTM_LE_RANDOM_CB* p_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;		tBTM_LE_RANDOM_CB* p_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;
	p_cb->private_addr = address;		p_cb->private_addr = address;