Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd648d04 authored by Dikra Prasetya's avatar Dikra Prasetya Committed by Automerger Merge Worker
Browse files

Merge "Fix address consolidation in SDP lookup and BT Obex Transport." am: 78fcd2e0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2465071



Change-Id: I40cb4818834b4b8d730bcc9b22a17e656a8351db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2920dfa 78fcd2e0

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

android/app/src/com/android/bluetooth/sdp/SdpManager.java

+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();

                }

            }