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

Commit e76ce53b authored by Dikra Prasetya's avatar Dikra Prasetya
Browse files

Fix address consolidation in SDP lookup and BT Obex Transport. 

Closely-related-but-separate bug: 262644199

Bug: 266796373
Bug: 269988033
Bug: 270118240
Tag: #refactor
Test: atest BluetoothInstrumentationTests
Change-Id: I745c8ae255196a245f7ddc767a67c52e3d561304
parent 50383a6f

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

                }

            }