| Chunk |
|---|
| Conflicting content |
|---|
private int channel;
private int type;
<<<<<<< HEAD
=======
private static final int ECONNREFUSED = -111; // Socket error code - Connection refused
>>>>>>> 89e035ed1e90c5b86c57dab9e403399cbf6ede38
private static final int EINTERRUPT = -1000;
public RfcommConnectThread(BluetoothDevice device, int channel, int type) { |
| Solution content |
|---|
private int channel;
private int type;
private static final int EINTERRUPT = -1000;
public RfcommConnectThread(BluetoothDevice device, int channel, int type) { |
| File |
|---|
| BluetoothHeadsetService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
int result = waitForConnect(headset);
<<<<<<< HEAD
if (result != EINTERRUPT && result != 1) {
=======
if (result == ECONNREFUSED) {
>>>>>>> 89e035ed1e90c5b86c57dab9e403399cbf6ede38
Log.i(TAG, "Trying to connect to rfcomm socket again after 1 sec");
try {
sleep(1000); // 1 second |
| Solution content |
|---|
int result = waitForConnect(headset);
if (result != EINTERRUPT && result != 1) {
Log.i(TAG, "Trying to connect to rfcomm socket again after 1 sec");
try {
sleep(1000); // 1 second |
| File |
|---|
| BluetoothHeadsetService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
* or 0 if no hint should be visible.
* @param hintColorResId resource ID for the color of the hint text
*/
<<<<<<< HEAD
/* package */ void updateSlidingTabHint(int hintTextResId, int hintColorResId) {
=======
/* package */ void updateRotarySelectorHint(int hintTextResId, int hintColorResId) {
>>>>>>> 89e035ed1e90c5b86c57dab9e403399cbf6ede38
if (VDBG) log("updateRotarySelectorHint(" + hintTextResId + ")...");
if (mCallCard != null) {
mCallCard.setRotarySelectorHint(hintTextResId, hintColorResId); |
| Solution content |
|---|
* or 0 if no hint should be visible.
* @param hintColorResId resource ID for the color of the hint text
*/
/* package */ void updateSlidingTabHint(int hintTextResId, int hintColorResId) {
if (VDBG) log("updateRotarySelectorHint(" + hintTextResId + ")...");
if (mCallCard != null) {
mCallCard.setRotarySelectorHint(hintTextResId, hintColorResId); |
| File |
|---|
| InCallScreen.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
super.onCreate(icicle);
Intent intent = getIntent();
<<<<<<< HEAD
final Configuration configuration = getResources().getConfiguration();
if (DBG) Log.v(TAG, "onCreate: this = " + this + ", icicle = " + icicle);
if (DBG) Log.v(TAG, " - getIntent() = " + intent);
if (DBG) Log.v(TAG, " - configuration = " + configuration);
if (icicle != null) {
// A non-null icicle means that this activity is being
// re-initialized after previously being shut down.
//
// In practice this happens very rarely (because the lifetime
// of this activity is so short!), but it *can* happen if the
// framework detects a configuration change at exactly the
// right moment; see bug 2202413.
//
// In this case, do nothing. Our onCreate() method has already
// run once (with icicle==null the first time), which means
// that the NEW_OUTGOING_CALL broadcast for this new call has
// already been sent.
Log.i(TAG, "onCreate: non-null icicle! "
+ "Bailing out, not sending NEW_OUTGOING_CALL broadcast...");
// No need to finish() here, since the OutgoingCallReceiver from
// our original instance will do that. (It'll actually call
// finish() on our original instance, which apparently works fine
// even though the ActivityManager has already shut that instance
// down. And note that if we *do* call finish() here, that just
// results in an "ActivityManager: Duplicate finish request"
// warning when the OutgoingCallReceiver runs.)
return;
}
=======
if (DBG) Log.v(TAG, "onCreate: getIntent() = " + intent);
>>>>>>> 89e035ed1e90c5b86c57dab9e403399cbf6ede38
String action = intent.getAction();
String number = PhoneNumberUtils.getNumberFromIntent(intent, this); |
| Solution content |
|---|
super.onCreate(icicle);
Intent intent = getIntent();
final Configuration configuration = getResources().getConfiguration();
if (DBG) Log.v(TAG, "onCreate: this = " + this + ", icicle = " + icicle);
if (DBG) Log.v(TAG, " - getIntent() = " + intent);
if (DBG) Log.v(TAG, " - configuration = " + configuration);
if (icicle != null) {
// A non-null icicle means that this activity is being
// re-initialized after previously being shut down.
//
// In practice this happens very rarely (because the lifetime
// of this activity is so short!), but it *can* happen if the
// framework detects a configuration change at exactly the
// right moment; see bug 2202413.
//
// In this case, do nothing. Our onCreate() method has already
// run once (with icicle==null the first time), which means
// that the NEW_OUTGOING_CALL broadcast for this new call has
// already been sent.
Log.i(TAG, "onCreate: non-null icicle! "
+ "Bailing out, not sending NEW_OUTGOING_CALL broadcast...");
// No need to finish() here, since the OutgoingCallReceiver from
// our original instance will do that. (It'll actually call
// finish() on our original instance, which apparently works fine
// even though the ActivityManager has already shut that instance
// down. And note that if we *do* call finish() here, that just
// results in an "ActivityManager: Duplicate finish request"
// warning when the OutgoingCallReceiver runs.)
return;
}
String action = intent.getAction();
String number = PhoneNumberUtils.getNumberFromIntent(intent, this); |
| File |
|---|
| OutgoingCallBroadcaster.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
=======
>>>>>>> 89e035ed1e90c5b86c57dab9e403399cbf6ede38
* number, so there's no point in allowing apps to modify the number. */
if (number == null || TextUtils.isEmpty(number)) {
if (intent.getBooleanExtra(EXTRA_SEND_EMPTY_FLASH, false)) {
<<<<<<< HEAD
Log.i(TAG, "onCreate: SEND_EMPTY_FLASH...");
PhoneUtils.sendEmptyFlash(PhoneApp.getInstance().phone);
finish();
return; |
| Solution content |
|---|
* number, so there's no point in allowing apps to modify the number. */
if (number == null || TextUtils.isEmpty(number)) {
if (intent.getBooleanExtra(EXTRA_SEND_EMPTY_FLASH, false)) {
Log.i(TAG, "onCreate: SEND_EMPTY_FLASH...");
PhoneUtils.sendEmptyFlash(PhoneApp.getInstance().phone);
finish();
return; |
| File |
|---|
| OutgoingCallBroadcaster.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
finish();
return;
} else {
<<<<<<< HEAD
Log.i(TAG, "onCreate: null or empty number, setting callNow=true...");
=======
>>>>>>> 89e035ed1e90c5b86c57dab9e403399cbf6ede38
callNow = true;
}
} |
| Solution content |
|---|
finish();
return;
} else {
Log.i(TAG, "onCreate: null or empty number, setting callNow=true...");
callNow = true;
}
} |
| File |
|---|
| OutgoingCallBroadcaster.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
new OutgoingCallReceiver(), null, Activity.RESULT_OK, number, null);
// The receiver will finish our activity when it finally runs.
}
<<<<<<< HEAD
// Implement onConfigurationChanged() purely for debugging purposes,
// to make sure that the android:configChanges element in our manifest
// is working properly.
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
if (DBG) Log.v(TAG, "onConfigurationChanged: newConfig = " + newConfig);
}
=======
>>>>>>> 89e035ed1e90c5b86c57dab9e403399cbf6ede38
} |
| Solution content |
|---|
new OutgoingCallReceiver(), null, Activity.RESULT_OK, number, null);
// The receiver will finish our activity when it finally runs.
}
// Implement onConfigurationChanged() purely for debugging purposes,
// to make sure that the android:configChanges element in our manifest
// is working properly.
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
if (DBG) Log.v(TAG, "onConfigurationChanged: newConfig = " + newConfig);
}
} |
| File |
|---|
| OutgoingCallBroadcaster.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |