Projects >> packages_apps_Phone >>5ea242f4020a31a17c2171d837d20e821e63b564

Chunk
Conflicting content
            mRemoteHeadsets.get(device).mState = state;

            sendBroadcast(intent, BLUETOOTH_PERM);
<<<<<<< HEAD
            if (state == BluetoothProfile.STATE_CONNECTING) {
                // Set the priority to AUTO_CONNECT
                setPriority(device, BluetoothProfile.PRIORITY_AUTO_CONNECT);
=======
            if (state == BluetoothHeadset.STATE_CONNECTED) {
                // Set the priority to AUTO_CONNECT
                setPriority(device, BluetoothHeadset.PRIORITY_AUTO_CONNECT);
                adjustOtherHeadsetPriorities(device);
>>>>>>> 8be16c194cf1ba455f5872ccc1b2a82eaa3c9dd8
            }
       }
    }
Solution content
            mRemoteHeadsets.get(device).mState = state;

            sendBroadcast(intent, BLUETOOTH_PERM);
            if (state == BluetoothHeadset.STATE_CONNECTED) {
                // Set the priority to AUTO_CONNECT
                setPriority(device, BluetoothHeadset.PRIORITY_AUTO_CONNECT);
                adjustOtherHeadsetPriorities(device);
            }
       }
    }
File
BluetoothHeadsetService.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation