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

Commit 337b2798 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android (Google) Code Review
Browse files

Merge "Fix failure of Opp."

parents 35233251 421f0101
Loading
Loading
Loading
Loading
+3 −12
Original line number Diff line number Diff line
@@ -1247,18 +1247,9 @@ public class BluetoothService extends IBluetooth.Stub {
            return true;
        }

        boolean ret;
        // Just do the SDP if the device is already  created and UUIDs are not
        // NULL, else create the device and then do SDP.
        if (mDeviceProperties.isInCache(address) && getRemoteUuids(address) != null) {
            String path = getObjectPathFromAddress(address);
            if (path == null) return false;

            // Use an empty string for the UUID pattern
            ret = discoverServicesNative(path, "");
        } else {
            ret = createDeviceNative(address);
        }
        // If the device is already created, we will
        // do the SDP on the callback of createDeviceNative.
        boolean ret= createDeviceNative(address);

        mUuidIntentTracker.add(address);
        if (uuid != null) {