| Chunk |
|---|
| Conflicting content |
|---|
"using IBluetoothHeadsetPhone proxy");
phoneNumber = "";
}
<<<<<<< HEAD
clccResponseNative(1, 0, 0, 0, false, phoneNumber, type,
getByteAddress(device));
=======
clccResponseNative(1, 0, 0, 0, false, phoneNumber, type);
clccResponseNative(0, 0, 0, 0, false, "", 0);
>>>>>>> 7efa9db2129c99475684a2e44c4fb89cce3134bc
}
else if (!mPhoneProxy.listCurrentCalls()) {
clccResponseNative(0, 0, 0, 0, false, "", 0, |
| Solution content |
|---|
"using IBluetoothHeadsetPhone proxy");
phoneNumber = "";
}
clccResponseNative(1, 0, 0, 0, false, phoneNumber, type,
getByteAddress(device));
}
else if (!mPhoneProxy.listCurrentCalls()) {
clccResponseNative(0, 0, 0, 0, false, "", 0, |
| File |
|---|
| HeadsetStateMachine.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |