Merge "Fix address consolidation in SDP lookup and BT Obex Transport." (78fcd2e0) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/BluetoothObexTransport.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,9 @@ public class BluetoothObexTransport implements ObexTransport {
		if (mSocket == null) {
		return null;
		}
		return mSocket.getRemoteDevice().getAddress();
		return mSocket.getConnectionType() == BluetoothSocket.TYPE_RFCOMM
		? mSocket.getRemoteDevice().getIdentityAddress()
		: mSocket.getRemoteDevice().getAddress();
		}

		@Override

+7 −5

Original line number	Diff line number	Diff line
		@@ -188,8 +188,9 @@ public class SdpManager {
		addressString = sAdapterService.getIdentityAddress(addressString);
		ParcelUuid uuid = Utils.byteArrayToUuid(uuidBytes)[0];
		for (SdpSearchInstance inst : mList) {
		if (inst.getDevice().getAddress().equals(addressString) && inst.getUuid()
		.equals(uuid)) {
		String instAddressString =
		sAdapterService.getIdentityAddress(inst.getDevice().getAddress());
		if (instAddressString.equals(addressString) && inst.getUuid().equals(uuid)) {
		return inst;
		}
		}
		@@ -197,10 +198,11 @@ public class SdpManager {
		}

		boolean isSearching(BluetoothDevice device, ParcelUuid uuid) {
		String addressString = device.getAddress();
		String addressString = sAdapterService.getIdentityAddress(device.getAddress());
		for (SdpSearchInstance inst : mList) {
		if (inst.getDevice().getAddress().equals(addressString) && inst.getUuid()
		.equals(uuid)) {
		String instAddressString =
		sAdapterService.getIdentityAddress(inst.getDevice().getAddress());
		if (instAddressString.equals(addressString) && inst.getUuid().equals(uuid)) {
		return inst.isSearching();
		}
		}