Snap for 8964501 from ff541d1574328e8d1d88b8b7288497c0f0e0d05f to tm-qpr1-release (d80169af) · Commits · e / os / android_packages_modules_Bluetooth

android/pandora/server/Android.bp

+20 −1

Original line number	Diff line number	Diff line
		@@ -45,16 +45,35 @@ android_test_helper_app {
		optimize: {
		enabled: false,
		},

		test_suites: [
		"device-tests",
		"mts-bluetooth",
		],
		}

		android_test {
		name: "pts-bot",
		required: ["PandoraServer"],
		test_config: "configs/PtsBotTest.xml",
		data: ["configs/pts_bot_tests_config.json", ":mmi2grpc"],
		data: [
		"configs/pts_bot_tests_config.json",
		":mmi2grpc"
		],
		test_suites: ["device-tests"],
		}

		android_test {
		name: "pts-bot-mts",
		required: ["PandoraServer"],
		test_config: "configs/PtsBotTestMts.xml",
		data: [
		"configs/pts_bot_tests_config.json",
		":mmi2grpc"
		],
		test_suites: ["mts-bluetooth"],
		}

		java_library {
		name: "pandora-grpc-java",
		visibility: ["//visibility:private"],

android/pandora/server/configs/PtsBotTestMts.xml

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		<configuration description="Runs PTS-bot tests in MTS">
		<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
		<option name="test-file-name" value="PandoraServer.apk" />
		<option name="install-arg" value="-r" />
		<option name="install-arg" value="-g" />
		</target_preparer>

		<target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
		<option name="post-install-cmd" value="am instrument -e Debug false com.android.pandora/.Main" />
		</target_preparer>

		<target_preparer class="com.android.tradefed.targetprep.PythonVirtualenvPreparer">
		<option name="dep-module" value="grpcio" />
		<option name="dep-module" value="protobuf==3.20.1" />
		<option name="dep-module" value="scipy" />
		</target_preparer>

		<test class="com.android.tradefed.testtype.pandora.PtsBotTest" >
		<!-- mmi2grpc is contained inside testcases folder -->
		<option name="mmi2grpc" value="testcases" />
		<option name="tests-config-file" value="pts_bot_tests_config.json" />
		<option name="physical" value="false" />
		<option name="profile" value="A2DP/SRC" />
		<option name="profile" value="AVDTP/SRC" />
		<option name="profile" value="GATT/CL/GAC" />
		<option name="profile" value="HFP/AG/DIS" />
		<option name="profile" value="HFP/AG/HFI" />
		<option name="profile" value="HFP/AG/SLC" />
		<option name="profile" value="HFP/AG/TCA" />
		<option name="profile" value="SDP/SR" />
		<option name="profile" value="SM/CEN/EKS" />
		<option name="profile" value="SM/CEN/JW" />
		</test>

		<object type="module_controller"
		class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
		<option name="mainline-module-package-name" value="com.android.bluetooth" />
		</object>
		</configuration>

system/bta/av/bta_av_int.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -127,13 +127,13 @@ enum {

		/* events that do not go through state machine */
		#define BTA_AV_FIRST_NSM_EVT BTA_AV_API_ENABLE_EVT
		#define BTA_AV_LAST_NSM_EVT BTA_AV_API_STOP_EVT
		#define BTA_AV_LAST_NSM_EVT BTA_AV_API_SET_LATENCY_EVT

		/* API events passed to both SSMs (by bta_av_api_to_ssm) */
		#define BTA_AV_FIRST_A2S_API_EVT BTA_AV_API_START_EVT
		#define BTA_AV_FIRST_A2S_SSM_EVT BTA_AV_AP_START_EVT

		#define BTA_AV_LAST_EVT BTA_AV_API_STOP_EVT
		#define BTA_AV_LAST_EVT BTA_AV_API_SET_LATENCY_EVT

		/* maximum number of SEPS in stream discovery results */
		#define BTA_AV_NUM_SEPS 32

system/bta/dm/bta_dm_act.cc

+10 −0

Original line number	Diff line number	Diff line
		@@ -626,6 +626,15 @@ void bta_dm_remove_device(const RawAddress& bd_addr) {
		if (other_address == bd_addr) other_address = other_address2;

		if (other_address_connected) {
		// Get real transport
		if (other_transport == BT_TRANSPORT_AUTO) {
		bool connected_with_br_edr =
		BTM_IsAclConnectionUp(other_address, BT_TRANSPORT_BR_EDR);
		other_transport =
		connected_with_br_edr ? BT_TRANSPORT_BR_EDR : BT_TRANSPORT_LE;
		}
		LOG_INFO("other_address %s with transport %d connected",
		PRIVATE_ADDRESS(other_address), other_transport);
		/* Take the link down first, and mark the device for removal when
		* disconnected */
		for (int i = 0; i < bta_dm_cb.device_list.count; i++) {
		@@ -633,6 +642,7 @@ void bta_dm_remove_device(const RawAddress& bd_addr) {
		if (peer_device.peer_bdaddr == other_address &&
		peer_device.transport == other_transport) {
		peer_device.conn_state = BTA_DM_UNPAIRING;
		LOG_INFO("Remove ACL of address %s", PRIVATE_ADDRESS(other_address));

		/* Make sure device is not in acceptlist before we disconnect */
		GATT_CancelConnect(0, bd_addr, false);