Projects >> android_frameworks_base >>20c8f47330e7d4f5f191264f0d7ca67f6532adc2

Chunk
Conflicting content 
        return authorized;
    }

<<<<<<< HEAD
    private boolean isOtherInputDeviceConnected(String address) {
        Set devices =
            mBluetoothService.lookupInputDevicesMatchingStates(new int[] {
                                                BluetoothInputDevice.STATE_CONNECTING,
                                                BluetoothInputDevice.STATE_CONNECTED});

        for (BluetoothDevice device : devices) {
            if (!device.getAddress().equals(address)) return true;
        }
        return false;
=======
    private boolean onAgentOutOfBandDataAvailable(String objectPath) {
        if (!mBluetoothService.isEnabled()) return false;

        String address = mBluetoothService.getAddressFromObjectPath(objectPath);
        if (address == null) return false;

        if (mBluetoothService.getDeviceOutOfBandData(
            mAdapter.getRemoteDevice(address)) != null) {
            return true;
        }
        return false;

>>>>>>> 0522f5e9b7dac0dc0229c9ddb07e7e5482846b1a
    }

    private boolean isOtherSinkInNonDisconnectingState(String address) {
Solution content 
        return authorized;
    }

    private boolean isOtherInputDeviceConnected(String address) {
        Set devices =
            mBluetoothService.lookupInputDevicesMatchingStates(new int[] {
                                                BluetoothInputDevice.STATE_CONNECTING,
                                                BluetoothInputDevice.STATE_CONNECTED});

        for (BluetoothDevice device : devices) {
            if (!device.getAddress().equals(address)) return true;
        }
        return false;
    }

    private boolean onAgentOutOfBandDataAvailable(String objectPath) {
        if (!mBluetoothService.isEnabled()) return false;

        String address = mBluetoothService.getAddressFromObjectPath(objectPath);
        if (address == null) return false;

        if (mBluetoothService.getDeviceOutOfBandData(
            mAdapter.getRemoteDevice(address)) != null) {
            return true;
        }
    }

    private boolean isOtherSinkInNonDisconnectingState(String address) {
File
BluetoothEventLoop.java
Developer's decision
Manual
Kind of conflict
For statement
If statement
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
    private final BluetoothProfileState mHidProfileState;

    private BluetoothA2dpService mA2dpService;
<<<<<<< HEAD
    private final HashMap mInputDevices;
    private final HashMap mPanDevices;
=======
    private final HashMap> mDeviceOobData;
>>>>>>> 0522f5e9b7dac0dc0229c9ddb07e7e5482846b1a

    private static String mDockAddress;
    private String mDockPin;
Solution content 
    private final BluetoothProfileState mHidProfileState;

    private BluetoothA2dpService mA2dpService;
    private final HashMap mInputDevices;
    private final HashMap mPanDevices;
    private final HashMap> mDeviceOobData;

    private static String mDockAddress;
    private String mDockPin;
File
BluetoothService.java
Developer's decision
Concatenation
Kind of conflict
Attribute