Snap for 6118234 from f8e371e1487b93691ac7893414f50826f7f7bc47 to rvc-release (e5a3ce82) · Commits · e / os / android_packages_modules_Bluetooth

system/binder/android/bluetooth/IBluetoothPbap.aidl

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,4 +28,5 @@ interface IBluetoothPbap {
	List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);
	int getConnectionState(in BluetoothDevice device);		int getConnectionState(in BluetoothDevice device);
	void disconnect(in BluetoothDevice device);		void disconnect(in BluetoothDevice device);
			boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);
	}		}

system/bta/dm/bta_dm_act.cc

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -814,14 +814,10 @@ void bta_dm_remove_all_acl(const tBTA_DM_LINK_TYPE link_type) {

	/** Bonds with peer device */		/** Bonds with peer device */
	void bta_dm_bond(const RawAddress& bd_addr, tBTA_TRANSPORT transport) {		void bta_dm_bond(const RawAddress& bd_addr, tBTA_TRANSPORT transport) {
	tBTM_STATUS status;
	tBTA_DM_SEC sec_event;		tBTA_DM_SEC sec_event;
	char* p_name;		char* p_name;

	if (transport == BTA_TRANSPORT_UNKNOWN)		tBTM_STATUS status = BTM_SecBond(bd_addr, transport, 0, NULL, 0);
	status = BTM_SecBond(bd_addr, 0, NULL, 0);
	else
	status = BTM_SecBondByTransport(bd_addr, transport, 0, NULL, 0);

	if (bta_dm_cb.p_sec_cback && (status != BTM_CMD_STARTED)) {		if (bta_dm_cb.p_sec_cback && (status != BTM_CMD_STARTED)) {
	memset(&sec_event, 0, sizeof(tBTA_DM_SEC));		memset(&sec_event, 0, sizeof(tBTA_DM_SEC));

system/bta/dm/bta_dm_api.cc

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -210,14 +210,7 @@ void BTA_DmDiscoverUUID(const RawAddress& bd_addr, const Uuid& uuid,
	}		}

	/** This function initiates a bonding procedure with a peer device */		/** This function initiates a bonding procedure with a peer device */
	void BTA_DmBond(const RawAddress& bd_addr) {		void BTA_DmBond(const RawAddress& bd_addr, tBTA_TRANSPORT transport) {
	do_in_main_thread(FROM_HERE,
	base::Bind(bta_dm_bond, bd_addr, BTA_TRANSPORT_UNKNOWN));
	}

	/** This function initiates a bonding procedure with a peer device */
	void BTA_DmBondByTransport(const RawAddress& bd_addr,
	tBTA_TRANSPORT transport) {
	do_in_main_thread(FROM_HERE, base::Bind(bta_dm_bond, bd_addr, transport));		do_in_main_thread(FROM_HERE, base::Bind(bta_dm_bond, bd_addr, transport));
	}		}

system/bta/include/bta_api.h

+1 −16

Original line number	Original line	Diff line number	Diff line
	@@ -1188,20 +1188,6 @@ tBTA_STATUS BTA_DmGetCachedRemoteName(const RawAddress& remote_device,
	* Function BTA_DmBond		* Function BTA_DmBond
	*		*
	* Description This function initiates a bonding procedure with a peer		* Description This function initiates a bonding procedure with a peer
	* device. The bonding procedure enables authentication
	* and optionally encryption on the Bluetooth link.
	*
	*
	* Returns void
	*
	******************************************************************************/
	extern void BTA_DmBond(const RawAddress& bd_addr);

	/*******************************************************************************
	*
	* Function BTA_DmBondByTransport
	*
	* Description This function initiates a bonding procedure with a peer
	* device by designated transport. The bonding procedure		* device by designated transport. The bonding procedure
	* enables authentication and optionally encryption on the		* enables authentication and optionally encryption on the
	* Bluetooth link.		* Bluetooth link.
	@@ -1210,8 +1196,7 @@ extern void BTA_DmBond(const RawAddress& bd_addr);
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	extern void BTA_DmBondByTransport(const RawAddress& bd_addr,		extern void BTA_DmBond(const RawAddress& bd_addr, tBTA_TRANSPORT transport);
	tBTA_TRANSPORT transport);

	/*******************************************************************************		/*******************************************************************************
	*		*

system/btif/src/btif_dm.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -697,7 +697,7 @@ static void btif_dm_cb_create_bond(const RawAddress& bd_addr,
	if (status != BT_STATUS_SUCCESS)		if (status != BT_STATUS_SUCCESS)
	bond_state_changed(status, bd_addr, BT_BOND_STATE_NONE);		bond_state_changed(status, bd_addr, BT_BOND_STATE_NONE);
	} else {		} else {
	BTA_DmBondByTransport(bd_addr, transport);		BTA_DmBond(bd_addr, transport);
	}		}
	/* Track originator of bond creation */		/* Track originator of bond creation */
	pairing_cb.is_local_initiated = true;		pairing_cb.is_local_initiated = true;