| Chunk |
|---|
| Conflicting content |
|---|
int newType = -1;
int newPriority = -1;
<<<<<<< HEAD
for (int checkType=0; checkType <=
ConnectivityManager.MAX_NETWORK_TYPE; checkType++) {
if (checkType == prevNetType) continue;
if (mNetAttributes[checkType] == null) continue;
=======
for (int checkType=0; checkType <= ConnectivityManager.MAX_NETWORK_TYPE; checkType++) {
if (checkType == prevNetType) {
continue;
}
>>>>>>> 1f2f23bd16ff798a08d73f4159ddcb621e70fc94
if (mNetAttributes[checkType].isDefault()) {
/* TODO - if we have multiple nets we could use
* we may want to put more thought into which we choose |
| Solution content |
|---|
int newType = -1;
int newPriority = -1;
for (int checkType=0; checkType <= ConnectivityManager.MAX_NETWORK_TYPE; checkType++) {
if (checkType == prevNetType) continue;
if (mNetAttributes[checkType] == null) continue;
if (mNetAttributes[checkType].isDefault()) {
/* TODO - if we have multiple nets we could use
* we may want to put more thought into which we choose |
| File |
|---|
| ConnectivityService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| For statement |
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
}
if (mNetAttributes[checkType].mPriority > newPriority) {
newType = checkType;
<<<<<<< HEAD
newPriority = mNetAttributes[newType].mPriority;
=======
newPriority = mRadioAttributes[mNetAttributes[newType].mRadio].mPriority;
>>>>>>> 1f2f23bd16ff798a08d73f4159ddcb621e70fc94
}
}
} |
| Solution content |
|---|
}
if (mNetAttributes[checkType].mPriority > newPriority) {
newType = checkType;
newPriority = mNetAttributes[newType].mPriority;
}
}
} |
| File |
|---|
| ConnectivityService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Array access |
| Attribute |
| Variable |