| Chunk |
|---|
| Conflicting content |
|---|
mDirection = DIRECTION_INCOMING;
initializeNativeDataNative(-1);
}
<<<<<<< HEAD
/* Create from an existing rfcomm connection */
public HeadsetBase(PowerManager pm, BluetoothAdapter adapter,
BluetoothDevice device,
int socketFd, int rfcommChannel, Handler handler) {
=======
/* Create from an already existing rfcomm connection */
public HeadsetBase(PowerManager pm, BluetoothAdapter adapter, BluetoothDevice device,
int socketFd, int rfcommChannel, Handler handler) {
>>>>>>> 0a972acf85ce0cf7bba5a77628e9cf59a0946bd0
mConnectTimestamp = System.currentTimeMillis();
mAdapter = adapter; |
| Solution content |
|---|
initializeNativeDataNative(-1);
}
/* Create from an existing rfcomm connection */
public HeadsetBase(PowerManager pm, BluetoothAdapter adapter,
BluetoothDevice device,
int socketFd, int rfcommChannel, Handler handler) {
mDirection = DIRECTION_INCOMING;
mConnectTimestamp = System.currentTimeMillis();
mAdapter = adapter; |
| File |
|---|
| HeadsetBase.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method signature |