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

Commit 77239140 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device. 

Merge commit '0e090309' into froyo-plus-aosp

* commit '0e090309':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
parents 664c7adb 0e090309

core/java/android/server/BluetoothService.java

+3 −1
Original line number Diff line number Diff line
@@ -1406,7 +1406,9 @@ public class BluetoothService extends IBluetooth.Stub { 
        }



        boolean ret;

        if (getBondState(address) == BluetoothDevice.BOND_BONDED) {

        // Just do the SDP if the device is already  created and UUIDs are not

        // NULL, else create the device and then do SDP.

        if (isRemoteDeviceInCache(address) && getRemoteUuids(address) != null) {

            String path = getObjectPathFromAddress(address);

            if (path == null) return false;