| Chunk |
|---|
| Conflicting content |
|---|
types = mDefaultApnTypes;
apnId = mDefaultApnId;
}
<<<<<<< HEAD
mActiveApn = new ApnSetting(apnId, "", "", "", "", "", "", "", "", "",
"", 0, types, "IP", "IP");
if (DBG) log("setupData: mActiveApn=" + mActiveApn);
=======
mActiveApn = new ApnSetting(0, "", "", "", "", "", "", "", "", "", "",
0, types, "IP", "IP");
>>>>>>> 362da509897a497848860ea8b9944ab192ad1e4c
Message msg = obtainMessage();
msg.what = EVENT_DATA_SETUP_COMPLETE; |
| Solution content |
|---|
types = mDefaultApnTypes;
apnId = mDefaultApnId;
}
mActiveApn = new ApnSetting(apnId, "", "", "", "", "", "", "", "", "",
"", 0, types, "IP", "IP");
if (DBG) log("setupData: mActiveApn=" + mActiveApn);
Message msg = obtainMessage();
msg.what = EVENT_DATA_SETUP_COMPLETE; |
| File |
|---|
| CdmaDataConnectionTracker.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| If statement |
| Method invocation |