| Chunk |
|---|
| Conflicting content |
|---|
case CONNECT_HFP_INCOMING:
// Connect A2DP if there is no incoming connection
// If the priority is OFF - don't auto connect.
<<<<<<< HEAD
if (mA2dpService.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON ||
mA2dpService.getPriority(mDevice) ==
BluetoothProfile.PRIORITY_AUTO_CONNECT) {
=======
if (mA2dpService.getSinkPriority(mDevice) == BluetoothA2dp.PRIORITY_ON ||
mA2dpService.getSinkPriority(mDevice) ==
BluetoothA2dp.PRIORITY_AUTO_CONNECT) {
>>>>>>> 1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b
Message msg = new Message();
msg.what = CONNECT_OTHER_PROFILES;
msg.arg1 = CONNECT_A2DP_OUTGOING; |
| Solution content |
|---|
case CONNECT_HFP_INCOMING:
// Connect A2DP if there is no incoming connection
// If the priority is OFF - don't auto connect.
if (mA2dpService.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON ||
mA2dpService.getPriority(mDevice) ==
BluetoothProfile.PRIORITY_AUTO_CONNECT) {
Message msg = new Message();
msg.what = CONNECT_OTHER_PROFILES;
msg.arg1 = CONNECT_A2DP_OUTGOING; |
| File |
|---|
| BluetoothDeviceProfileState.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
// This is again against spec. HFP incoming connections should be made
// before A2DP, so we should not hit this case. But many devices
// don't follow this.
<<<<<<< HEAD
if (mHeadsetService != null &&
(mHeadsetService.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON ||
mHeadsetService.getPriority(mDevice) ==
BluetoothProfile.PRIORITY_AUTO_CONNECT)) {
=======
if (mHeadsetService.getPriority(mDevice) == BluetoothHeadset.PRIORITY_ON
|| mHeadsetService.getPriority(mDevice) ==
BluetoothHeadset.PRIORITY_AUTO_CONNECT) {
>>>>>>> 1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b
Message msg = new Message();
msg.what = CONNECT_OTHER_PROFILES;
msg.arg1 = CONNECT_HFP_OUTGOING; |
| Solution content |
|---|
// This is again against spec. HFP incoming connections should be made
// before A2DP, so we should not hit this case. But many devices
// don't follow this.
if (mHeadsetService != null &&
(mHeadsetService.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON ||
mHeadsetService.getPriority(mDevice) ==
BluetoothProfile.PRIORITY_AUTO_CONNECT)) {
Message msg = new Message();
msg.what = CONNECT_OTHER_PROFILES;
msg.arg1 = CONNECT_HFP_OUTGOING; |
| File |
|---|
| BluetoothDeviceProfileState.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |