| Chunk |
|---|
| Conflicting content |
|---|
}
// Check if incoming connection has already connected.
<<<<<<< HEAD
if (mRemoteHeadsets.get(device).mState == BluetoothProfile.STATE_CONNECTED) {
=======
if (mRemoteHeadsets.get(device).mState == BluetoothHeadset.STATE_CONNECTED) {
>>>>>>> 7f5401573d05ee995a4ae3871ffe8068306f9f7e
return;
}
|
| Solution content |
|---|
}
// Check if incoming connection has already connected.
if (mRemoteHeadsets.get(device).mState == BluetoothProfile.STATE_CONNECTED) {
return;
}
|
| File |
|---|
| BluetoothHeadsetService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |