Projects >> platform_packages_apps_Phone >>5603cef3e91bef1e2fae956aa66c261937442ccc

Chunk
Conflicting content
                case BluetoothHeadset.STATE_CONNECTED:
                    Log.i(TAG, "Already connected to " + device + ", disconnecting " +
                            info.mRemoteDevice);
<<<<<<< HEAD

                    headset = new HeadsetBase(mPowerManager, mAdapter,
                                              info.mRemoteDevice,
                                              info.mSocketFd, info.mRfcommChan,
                                              null);
                    headset.disconnect();
=======
                    rejectIncomingConnection(info);
>>>>>>> 11f5d94dd5d0b5c81a84423008d6d7ccfcae2f57
                    break;
                }
            }
Solution content
                case BluetoothHeadset.STATE_CONNECTED:
                    Log.i(TAG, "Already connected to " + device + ", disconnecting " +
                            info.mRemoteDevice);
                    rejectIncomingConnection(info);
                    break;
                }
            }
File
BluetoothHeadsetService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable