| Chunk |
|---|
| Conflicting content |
|---|
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
<<<<<<< HEAD
writer.println("enabled: " + mEnable);
writer.println("state: " + mState);
writer.println("address: " + mAddress);
writer.println("name: " + mName);
=======
writer.println("Bluetooth Status");
writer.println(" enabled: " + mEnable);
writer.println(" state: " + mState);
writer.println(" address: " + mAddress);
writer.println(" name: " + mName + "\n");
>>>>>>> 7c2500564b8a79c001c455928b56d45b967bae4b
if (mBluetooth == null) {
writer.println("Bluetooth Service not connected");
} else { |
| Solution content |
|---|
writer.println("name: " + mName);
if (mBluetooth == null) {
public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
writer.println("enabled: " + mEnable);
writer.println("state: " + mState);
writer.println("address: " + mAddress);
writer.println("Bluetooth Service not connected");
} else { |
| File |
|---|
| BluetoothManagerService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
writer.println("Bluetooth Service not connected");
} else {
try {
<<<<<<< HEAD
writer.println(mBluetooth.dump());
=======
writer.println("Bonded devices:");
for (BluetoothDevice device : mBluetooth.getBondedDevices()) {
writer.println(" " + device.getAddress() +
" [" + DEVICE_TYPE_NAMES[device.getType()] + "] " +
device.getName());
}
writer.flush();
ParcelFileDescriptor pfd = ParcelFileDescriptor.dup(fd);
mBluetooth.dump(pfd);
pfd.close();
>>>>>>> 7c2500564b8a79c001c455928b56d45b967bae4b
} catch (RemoteException re) {
writer.println("RemoteException while calling Bluetooth Service");
} |
| Solution content |
|---|
writer.println("Bluetooth Service not connected");
} else {
try {
writer.println("Bonded devices:");
for (BluetoothDevice device : mBluetooth.getBondedDevices()) {
writer.println(" " + device.getAddress() +
" [" + DEVICE_TYPE_NAMES[device.getType()] + "] " +
device.getName());
}
writer.flush();
writer.println(mBluetooth.dump());
} catch (RemoteException re) {
writer.println("RemoteException while calling Bluetooth Service");
} |
| File |
|---|
| BluetoothManagerService.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| For statement |
| Method invocation |
| Variable |