Projects >> android_packages_apps_Bluetooth >>6e1ec7f9efd167a9c7ea7a0fe9a2cb9ca5c30a34

Chunk
Conflicting content 
    boolean isConnected(BluetoothDevice device) {
        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
<<<<<<< HEAD
        byte[] addr = Utils.getBytesFromAddress(device.getAddress());
        return isConnectedNative(addr);
=======

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);
        if (deviceProp == null) return false;
        return deviceProp.getOpenAclConnectionCount() > 0;
>>>>>>> a03c33b370420dc6ad688b217b5a37bfa43169cf
    }

     String getRemoteName(BluetoothDevice device) {
Solution content 
    boolean isConnected(BluetoothDevice device) {
        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
        byte[] addr = Utils.getBytesFromAddress(device.getAddress());
        return isConnectedNative(addr);
    }

     String getRemoteName(BluetoothDevice device) {
File
AdapterService.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
            }
        }

<<<<<<< HEAD
=======
        int getOpenAclConnectionCount() {
            return mOpenAclConnectionCount.get();
        }
    }

>>>>>>> a03c33b370420dc6ad688b217b5a37bfa43169cf
    private void sendUuidIntent(BluetoothDevice device) {
        DeviceProperties prop = getDeviceProperties(device);
        Intent intent = new Intent(BluetoothDevice.ACTION_UUID);
Solution content 
            }
        }
    }

    private void sendUuidIntent(BluetoothDevice device) {
        DeviceProperties prop = getDeviceProperties(device);
        Intent intent = new Intent(BluetoothDevice.ACTION_UUID);
File
RemoteDevices.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
            return;
        }

<<<<<<< HEAD
=======
        int openAclConnectionCount;
>>>>>>> a03c33b370420dc6ad688b217b5a37bfa43169cf
        DeviceProperties prop = getDeviceProperties(device);
        if (prop == null) {
            errorLog("aclStateChangeCallback reported unknown device " + Arrays.toString(address));
Solution content 
            return;
        }

        DeviceProperties prop = getDeviceProperties(device);
        if (prop == null) {
            errorLog("aclStateChangeCallback reported unknown device " + Arrays.toString(address));
File
RemoteDevices.java
Developer's decision
Version 1
Kind of conflict
Variable