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

Commit 11376273 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify sdpSearch 

Bug: 145171640
Test: compile & run
Change-Id: I88ce98a87c2c3120b47d40799c77f9c3c5b91eb0
parent aea56a7c

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+5 −10
Original line number Diff line number Diff line
@@ -1825,7 +1825,11 @@ public class AdapterService extends Service { 


            enforceBluetoothPermission(service);



            return service.sdpSearch(device, uuid);

            if (service.mSdpManager == null) {

                return false;

            }

            service.mSdpManager.sdpSearch(device, uuid);

            return true;

        }



        @Override
@@ -2194,15 +2198,6 @@ public class AdapterService extends Service { 
        return mDatabaseManager;

    }



    boolean sdpSearch(BluetoothDevice device, ParcelUuid uuid) {

        if (mSdpManager != null) {

            mSdpManager.sdpSearch(device, uuid);

            return true;

        } else {

            return false;

        }

    }



    boolean createBond(BluetoothDevice device, int transport, OobData oobData) {

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp != null && deviceProp.getBondState() != BluetoothDevice.BOND_NONE) {